Skip to content

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.

Sign up for GitHub

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 13 commits into from
Jan 16, 2019
Merged

BUG: DataFrame.min/max with axis=1 and uniform datetime64[ns, tz] types does not return NaNs #24759

Show file tree
Hide file tree
Changes from 12 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
Jan 9, 2019
69757df
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
Jan 9, 2019
c295a92
change behavior in reduce method
Jan 10, 2019
20e0e6f
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
Jan 11, 2019
0f3b5c0
add test
Jan 11, 2019
ca315b1
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
Jan 13, 2019
f84f126
Add whatsnew and add short circuting in check
Jan 14, 2019
de214c4
still check dtypes length
Jan 14, 2019
a21a7ac
move test to test_reductions.py
Jan 14, 2019
d8e0603
use _is_homegeneous_type
Jan 14, 2019
3736f22
Merge remote-tracking branch 'upstream/master' into tz_aware_reductio…
Jan 14, 2019
4964dab
change condidtion
Jan 14, 2019
190db02
Use is_datetime64tz_type
Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.24.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,6 +1647,7 @@ Timezones
- Bug in :meth:`DataFrame.any` returns wrong value when ``axis=1`` and the data is of datetimelike type (:issue:`23070`)
- Bug in :meth:`DatetimeIndex.to_period` where a timezone aware index was converted to UTC first before creating :class:`PeriodIndex` (:issue:`22905`)
- Bug in :meth:`DataFrame.tz_localize`, :meth:`DataFrame.tz_convert`, :meth:`Series.tz_localize`, and :meth:`Series.tz_convert` where ``copy=False`` would mutate the original argument inplace (:issue:`6326`)
- Bug in :meth:`DataFrame.max` and :meth:`DataFrame.min` with ``axis=1`` where a :class:`Series` with ``NaN`` would be returned when all columns contained the same timezone (:issue:`10390`)

Offsets
^^^^^^^
Expand Down
4 changes: 3 additions & 1 deletion pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7390,7 +7390,9 @@ def f(x):
return op(x, axis=axis, skipna=skipna, **kwds)

# exclude timedelta/datetime unless we are uniform types
if axis == 1 and self._is_mixed_type and self._is_datelike_mixed_type:
if (axis == 1 and self._is_datelike_mixed_type
and (not self._is_homogeneous_type
and not self._data.blocks[0].is_datetimetz)):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

really don't like the last condition as this is reaching into internals. are the prior ones not sufficient?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternative is is_datetimetz64_dtype(self.dtypes[0]). I don't have a preference on which is cleaner.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opted for your suggestion @TomAugspurger. Looks a little cleaner from first inspection.

numeric_only = True

if numeric_only is None:
Expand Down
13 changes: 13 additions & 0 deletions pandas/tests/reductions/test_reductions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,19 @@ def test_nanops(self):
assert obj.argmin(skipna=False) == -1
assert obj.argmax(skipna=False) == -1

@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(pd.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)


class TestSeriesReductions(object):
# Note: the name TestSeriesReductions indicates these tests
Expand Down