|
8 | 8 | import pytz
|
9 | 9 |
|
10 | 10 | import pandas as pd
|
11 |
| -from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range |
| 11 | +from pandas import ( |
| 12 | + DataFrame, |
| 13 | + DatetimeIndex, |
| 14 | + Index, |
| 15 | + MultiIndex, |
| 16 | + Series, |
| 17 | + Timestamp, |
| 18 | + date_range, |
| 19 | + offsets, |
| 20 | +) |
12 | 21 | import pandas._testing as tm
|
13 | 22 | from pandas.core.groupby.grouper import Grouper
|
14 | 23 | from pandas.core.groupby.ops import BinGrouper
|
@@ -243,17 +252,20 @@ def test_timegrouper_with_reg_groups(self):
|
243 | 252 |
|
244 | 253 | # single groupers
|
245 | 254 | expected = DataFrame(
|
246 |
| - {"Quantity": [31], "Date": [datetime(2013, 10, 31, 0, 0)]} |
247 |
| - ).set_index("Date") |
| 255 | + [[31]], |
| 256 | + columns=["Quantity"], |
| 257 | + index=DatetimeIndex( |
| 258 | + [datetime(2013, 10, 31, 0, 0)], freq=offsets.MonthEnd(), name="Date" |
| 259 | + ), |
| 260 | + ) |
248 | 261 | result = df.groupby(pd.Grouper(freq="1M")).sum()
|
249 | 262 | tm.assert_frame_equal(result, expected)
|
250 | 263 |
|
251 | 264 | result = df.groupby([pd.Grouper(freq="1M")]).sum()
|
252 | 265 | tm.assert_frame_equal(result, expected)
|
253 | 266 |
|
254 |
| - expected = DataFrame( |
255 |
| - {"Quantity": [31], "Date": [datetime(2013, 11, 30, 0, 0)]} |
256 |
| - ).set_index("Date") |
| 267 | + expected.index = expected.index.shift(1) |
| 268 | + assert expected.index.freq == offsets.MonthEnd() |
257 | 269 | result = df.groupby(pd.Grouper(freq="1M", key="Date")).sum()
|
258 | 270 | tm.assert_frame_equal(result, expected)
|
259 | 271 |
|
@@ -448,7 +460,7 @@ def test_groupby_groups_datetimeindex(self):
|
448 | 460 | for date in dates:
|
449 | 461 | result = grouped.get_group(date)
|
450 | 462 | data = [[df.loc[date, "A"], df.loc[date, "B"]]]
|
451 |
| - expected_index = pd.DatetimeIndex([date], name="date") |
| 463 | + expected_index = pd.DatetimeIndex([date], name="date", freq="D") |
452 | 464 | expected = pd.DataFrame(data, columns=list("AB"), index=expected_index)
|
453 | 465 | tm.assert_frame_equal(result, expected)
|
454 | 466 |
|
|
0 commit comments