@@ -1365,15 +1365,16 @@ def test_resample_consistency(unit):
1365
1365
1366
1366
1367
1367
@pytest .mark .parametrize ("dates" , [dates1 , dates2 , dates3 ])
1368
- def test_resample_timegrouper (dates ):
1368
+ def test_resample_timegrouper (dates , unit ):
1369
1369
# GH 7227
1370
+ dates = DatetimeIndex (dates ).as_unit (unit )
1370
1371
df = DataFrame ({"A" : dates , "B" : np .arange (len (dates ))})
1371
1372
result = df .set_index ("A" ).resample ("ME" ).count ()
1372
1373
exp_idx = DatetimeIndex (
1373
1374
["2014-07-31" , "2014-08-31" , "2014-09-30" , "2014-10-31" , "2014-11-30" ],
1374
1375
freq = "ME" ,
1375
1376
name = "A" ,
1376
- )
1377
+ ). as_unit ( unit )
1377
1378
expected = DataFrame ({"B" : [1 , 0 , 2 , 2 , 1 ]}, index = exp_idx )
1378
1379
if df ["A" ].isna ().any ():
1379
1380
expected .index = expected .index ._with_freq (None )
@@ -2077,26 +2078,39 @@ def test_resample_BM_deprecated():
2077
2078
tm .assert_series_equal (result , expected )
2078
2079
2079
2080
2080
- def test_resample_ms_closed_right ():
2081
+ def test_resample_ms_closed_right (unit ):
2081
2082
# https://github.com/pandas-dev/pandas/issues/55271
2082
- dti = date_range (start = "2020-01-31" , freq = "1min" , periods = 6000 )
2083
+ dti = date_range (start = "2020-01-31" , freq = "1min" , periods = 6000 , unit = unit )
2083
2084
df = DataFrame ({"ts" : dti }, index = dti )
2084
2085
grouped = df .resample ("MS" , closed = "right" )
2085
2086
result = grouped .last ()
2087
+ exp_dti = DatetimeIndex (
2088
+ [datetime (2020 , 1 , 1 ), datetime (2020 , 2 , 1 )], freq = "MS"
2089
+ ).as_unit (unit )
2086
2090
expected = DataFrame (
2087
2091
{"ts" : [datetime (2020 , 2 , 1 ), datetime (2020 , 2 , 4 , 3 , 59 )]},
2088
- index = DatetimeIndex ([ datetime ( 2020 , 1 , 1 ), datetime ( 2020 , 2 , 1 )], freq = "MS" ) ,
2089
- )
2092
+ index = exp_dti ,
2093
+ ). astype ( f"M8[ { unit } ]" )
2090
2094
tm .assert_frame_equal (result , expected )
2091
2095
2092
2096
2093
2097
@pytest .mark .parametrize ("freq" , ["B" , "C" ])
2094
- def test_resample_c_b_closed_right (freq : str ):
2098
+ def test_resample_c_b_closed_right (freq : str , unit ):
2095
2099
# https://github.com/pandas-dev/pandas/issues/55281
2096
- dti = date_range (start = "2020-01-31" , freq = "1min" , periods = 6000 )
2100
+ dti = date_range (start = "2020-01-31" , freq = "1min" , periods = 6000 , unit = unit )
2097
2101
df = DataFrame ({"ts" : dti }, index = dti )
2098
2102
grouped = df .resample (freq , closed = "right" )
2099
2103
result = grouped .last ()
2104
+
2105
+ exp_dti = DatetimeIndex (
2106
+ [
2107
+ datetime (2020 , 1 , 30 ),
2108
+ datetime (2020 , 1 , 31 ),
2109
+ datetime (2020 , 2 , 3 ),
2110
+ datetime (2020 , 2 , 4 ),
2111
+ ],
2112
+ freq = freq ,
2113
+ ).as_unit (unit )
2100
2114
expected = DataFrame (
2101
2115
{
2102
2116
"ts" : [
@@ -2106,35 +2120,28 @@ def test_resample_c_b_closed_right(freq: str):
2106
2120
datetime (2020 , 2 , 4 , 3 , 59 ),
2107
2121
]
2108
2122
},
2109
- index = DatetimeIndex (
2110
- [
2111
- datetime (2020 , 1 , 30 ),
2112
- datetime (2020 , 1 , 31 ),
2113
- datetime (2020 , 2 , 3 ),
2114
- datetime (2020 , 2 , 4 ),
2115
- ],
2116
- freq = freq ,
2117
- ),
2118
- )
2123
+ index = exp_dti ,
2124
+ ).astype (f"M8[{ unit } ]" )
2119
2125
tm .assert_frame_equal (result , expected )
2120
2126
2121
2127
2122
- def test_resample_b_55282 ():
2128
+ def test_resample_b_55282 (unit ):
2123
2129
# https://github.com/pandas-dev/pandas/issues/55282
2124
- s = Series (
2125
- [1 , 2 , 3 , 4 , 5 , 6 ], index = date_range ("2023-09-26" , periods = 6 , freq = "12h" )
2126
- )
2127
- result = s .resample ("B" , closed = "right" , label = "right" ).mean ()
2130
+ dti = date_range ("2023-09-26" , periods = 6 , freq = "12h" , unit = unit )
2131
+ ser = Series ([1 , 2 , 3 , 4 , 5 , 6 ], index = dti )
2132
+ result = ser .resample ("B" , closed = "right" , label = "right" ).mean ()
2133
+
2134
+ exp_dti = DatetimeIndex (
2135
+ [
2136
+ datetime (2023 , 9 , 26 ),
2137
+ datetime (2023 , 9 , 27 ),
2138
+ datetime (2023 , 9 , 28 ),
2139
+ datetime (2023 , 9 , 29 ),
2140
+ ],
2141
+ freq = "B" ,
2142
+ ).as_unit (unit )
2128
2143
expected = Series (
2129
2144
[1.0 , 2.5 , 4.5 , 6.0 ],
2130
- index = DatetimeIndex (
2131
- [
2132
- datetime (2023 , 9 , 26 ),
2133
- datetime (2023 , 9 , 27 ),
2134
- datetime (2023 , 9 , 28 ),
2135
- datetime (2023 , 9 , 29 ),
2136
- ],
2137
- freq = "B" ,
2138
- ),
2145
+ index = exp_dti ,
2139
2146
)
2140
2147
tm .assert_series_equal (result , expected )
0 commit comments