Skip to content

Series.describe returns first and last for tz-aware datetimes #21332

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 8 commits into from
Jul 6, 2018
Merged

Series.describe returns first and last for tz-aware datetimes #21332

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39f0e67
Series.describe returns first and last for tz-aware datetimes
louispotok Jun 5, 2018
be19766
parameterize tests
louispotok Jun 5, 2018
7ddf706
parameterize names
louispotok Jun 6, 2018
3eeec04
use tz_naive_fixture and fix top
louispotok Jun 19, 2018
0a9e0c6
add tz describe test for df
louispotok Jun 19, 2018
7fe331d
add bugfix to whatsnew
louispotok Jun 19, 2018
dd13740
fix formatting in whatsnew and add issue number to tests
louispotok Jul 6, 2018
0af4758
final bugfix
louispotok Jul 6, 2018
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
2 changes: 2 additions & 0 deletions doc/source/whatsnew/v0.24.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ Datetimelike
^^^^^^^^^^^^

- Fixed bug where two :class:`DateOffset` objects with different ``normalize`` attributes could evaluate as equal (:issue:`21404`)
- Bug in :class:`Index` with ``datetime64[ns, tz]`` dtype that did not localize integer data correctly (:issue:`20964`)
- Fixed bug where :meth:`DataFrame.describe` and :meth:`Series.describe` on tz-aware datetimes did not show `first` and `last` result (:issue:`21328`)
Copy link
Member

Choose a reason for hiding this comment

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

One more nit: Could you move this entry to the timezones section below?

Also the entry above this one exists in the timezone section already i.e. you can remove it.

Thanks for you patience.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, no problem.


Timedelta
^^^^^^^^^
Expand Down
11 changes: 6 additions & 5 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
is_bool_dtype,
is_categorical_dtype,
is_numeric_dtype,
is_datetime64_dtype,
is_datetime64_any_dtype,
is_timedelta64_dtype,
is_datetime64tz_dtype,
is_list_like,
Expand Down Expand Up @@ -8531,12 +8531,13 @@ def describe_categorical_1d(data):
if result[1] > 0:
top, freq = objcounts.index[0], objcounts.iloc[0]

if is_datetime64_dtype(data):
if is_datetime64_any_dtype(data):
tz = data.dt.tz
asint = data.dropna().values.view('i8')
names += ['top', 'freq', 'first', 'last']
result += [tslib.Timestamp(top), freq,
tslib.Timestamp(asint.min()),
tslib.Timestamp(asint.max())]
result += [tslib.Timestamp(top, tz=tz), freq,
tslib.Timestamp(asint.min(), tz=tz),
tslib.Timestamp(asint.max(), tz=tz)]
else:
names += ['top', 'freq']
result += [top, freq]
Expand Down
22 changes: 22 additions & 0 deletions pandas/tests/frame/test_analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,28 @@ def test_describe_timedelta_values(self):
"max 5 days 00:00:00 0 days 05:00:00")
assert repr(res) == exp_repr

def test_describe_tz_values(self, tz_naive_fixture):
# GH 21332
tz = tz_naive_fixture
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a comment with the issue number, like GH #21332

s1 = Series(range(5))
start = Timestamp(2018, 1, 1)
end = Timestamp(2018, 1, 5)
s2 = Series(date_range(start, end, tz=tz))
df = pd.DataFrame({'s1': s1, 's2': s2})

expected = DataFrame({'s1': [5, np.nan, np.nan, np.nan, np.nan, np.nan,
2, 1.581139, 0, 1, 2, 3, 4],
's2': [5, 5, s2.value_counts().index[0], 1,
start.tz_localize(tz),
end.tz_localize(tz), np.nan, np.nan,
np.nan, np.nan, np.nan, np.nan, np.nan]},
index=['count', 'unique', 'top', 'freq', 'first',
'last', 'mean', 'std', 'min', '25%', '50%',
'75%', 'max']
)
res = df.describe(include='all')
tm.assert_frame_equal(res, expected)

def test_reduce_mixed_frame(self):
# GH 6806
df = DataFrame({
Expand Down
17 changes: 17 additions & 0 deletions pandas/tests/series/test_analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,23 @@ def test_describe(self):
index=['count', 'unique', 'top', 'freq'])
tm.assert_series_equal(result, expected)

def test_describe_with_tz(self, tz_naive_fixture):
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a comment with the issue number, like GH #21332

# GH 21332
tz = tz_naive_fixture
name = tz_naive_fixture
start = Timestamp(2018, 1, 1)
Copy link
Contributor

Choose a reason for hiding this comment

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

can u add a new test and/or parametrize on the tz

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

end = Timestamp(2018, 1, 5)
s = Series(date_range(start, end, tz=tz), name=name)
Copy link
Contributor

Choose a reason for hiding this comment

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

can you add a test for frame as well (in the appropraite file)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

result = s.describe()
expected = Series(
[5, 5, s.value_counts().index[0], 1, start.tz_localize(tz),
end.tz_localize(tz)
],
name=name,
index=['count', 'unique', 'top', 'freq', 'first', 'last']
)
tm.assert_series_equal(result, expected)

def test_argsort(self):
self._check_accum_op('argsort', check_dtype=False)
argsorted = self.ts.argsort()
Expand Down