-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
BUG: fix wrong error message in deprecated 2D indexing of Series with datetime values #38099
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
jreback
merged 9 commits into
pandas-dev:master
from
jorisvandenbossche:regr-2d-indexing-error
Dec 1, 2020
Merged
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
f55f514
BUG: fix wrong error message in deprecated 2D indexing of Series with…
jorisvandenbossche a2cf40f
avoid catching AssertionError
jorisvandenbossche 32436e4
Merge remote-tracking branch 'upstream/master' into regr-2d-indexing-…
jorisvandenbossche 95df80a
clarify comment
jorisvandenbossche 8bf5ae4
Merge remote-tracking branch 'upstream/master' into regr-2d-indexing-…
jorisvandenbossche df0f6a2
update test
jorisvandenbossche 61e7731
fixup
jorisvandenbossche 6391f54
add whatsnew
jorisvandenbossche e44bf53
Revert "add whatsnew" - wrong PR
jorisvandenbossche File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -389,10 +389,22 @@ def test_getitem_generator(string_series): | |
tm.assert_series_equal(result2, expected) | ||
|
||
|
||
def test_getitem_ndim_deprecated(): | ||
s = Series([0, 1]) | ||
with tm.assert_produces_warning(FutureWarning): | ||
s[:, None] | ||
@pytest.mark.parametrize( | ||
"series", | ||
[ | ||
Series([0, 1]), | ||
Series(date_range("2012-01-01", periods=2)), | ||
Series(date_range("2012-01-01", periods=2, tz="CET")), | ||
], | ||
) | ||
def test_getitem_ndim_deprecated(series): | ||
with tm.assert_produces_warning( | ||
FutureWarning, match="Support for multi-dimensional indexing" | ||
): | ||
result = series[:, None] | ||
|
||
assert isinstance(result, np.ndarray) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not necessary but nbd |
||
tm.assert_numpy_array_equal(result, np.asarray(series)[:, None]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. really pref the as its what we always want to model |
||
|
||
|
||
def test_getitem_multilevel_scalar_slice_not_implemented( | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we recently started always-passing ndim to the constructor, so should never have None here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is backported though, so prob ok (but will need a patch on 1.2)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also done in the parent method, so can use a general clean-up for 1.2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kk can you open an issue so we don't forget to do this