-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: DataFrame.min/max with axis=1 and uniform datetime64[ns, tz] types does not return NaNs #24759
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
Merged
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
7272320
DataFrame reduction ops (axis=1) with same tz dtypes
69757df
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
c295a92
change behavior in reduce method
20e0e6f
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
0f3b5c0
add test
ca315b1
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
f84f126
Add whatsnew and add short circuting in check
de214c4
still check dtypes length
a21a7ac
move test to test_reductions.py
d8e0603
use _is_homegeneous_type
3736f22
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
4964dab
change condidtion
190db02
Use is_datetime64tz_type
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
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 |
---|---|---|
|
@@ -196,3 +196,15 @@ def test_tz_localize_convert_copy_inplace_mutate(self, copy, method, tz): | |
index=date_range('20131027', periods=5, | ||
freq='1H', tz=tz)) | ||
tm.assert_frame_equal(result, expected) | ||
|
||
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. these should go with the appropriate tests, I think in test_nanops or maybe tests/reductions) 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. Sure. Moved to |
||
@pytest.mark.parametrize('op, expected_col', [ | ||
['max', 'a'], ['min', 'b'] | ||
]) | ||
def test_same_tz_min_max_axis_1(self, op, expected_col): | ||
# GH 10390 | ||
df = DataFrame(date_range('2016-01-01 00:00:00', periods=3, tz='UTC'), | ||
columns=['a']) | ||
df['b'] = df.a.subtract(pd.Timedelta(seconds=3600)) | ||
result = getattr(df, op)(axis=1) | ||
expected = df[expected_col] | ||
tm.assert_series_equal(result, expected) |
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.
you shouldn't need this as
_is_datelike_mixed_type
should cover this case, no?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.
_is_datelike_mixed_type
is not specific to tz-aware blocks nor checks the actual timezone which we need hereThere 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.
Can you instead use
self._is_homogenous_type
and a check that any (or the first) dtype isdatetimetz
?