@@ -875,47 +875,47 @@ def test_resmaple_dst_anchor(self):
875
875
# 5172
876
876
dti = DatetimeIndex ([datetime (2012 , 11 , 4 , 23 )], tz = 'US/Eastern' )
877
877
df = DataFrame ([5 ], index = dti )
878
- assert_frame_equal (df .resample (rule = 'D' , how = 'sum' ),
878
+ assert_frame_equal (df .resample (rule = 'D' , how = 'sum' ),
879
879
DataFrame ([5 ], index = df .index .normalize ()))
880
880
df .resample (rule = 'MS' , how = 'sum' )
881
881
assert_frame_equal (df .resample (rule = 'MS' , how = 'sum' ),
882
- DataFrame ([5 ], index = DatetimeIndex ([datetime (2012 , 11 , 1 )],
882
+ DataFrame ([5 ], index = DatetimeIndex ([datetime (2012 , 11 , 1 )],
883
883
tz = 'US/Eastern' )))
884
884
885
885
dti = date_range ('2013-09-30' , '2013-11-02' , freq = '30Min' , tz = 'Europe/Paris' )
886
886
values = range (dti .size )
887
887
df = DataFrame ({"a" : values , "b" : values , "c" : values }, index = dti , dtype = 'int64' )
888
888
how = {"a" : "min" , "b" : "max" , "c" : "count" }
889
-
889
+
890
890
assert_frame_equal (df .resample ("W-MON" , how = how )[["a" , "b" , "c" ]],
891
891
DataFrame ({"a" : [0 , 48 , 384 , 720 , 1056 , 1394 ],
892
892
"b" : [47 , 383 , 719 , 1055 , 1393 , 1586 ],
893
893
"c" : [48 , 336 , 336 , 336 , 338 , 193 ]},
894
- index = date_range ('9/30/2013' , '11/4/2013' ,
894
+ index = date_range ('9/30/2013' , '11/4/2013' ,
895
895
freq = 'W-MON' , tz = 'Europe/Paris' )),
896
896
'W-MON Frequency' )
897
897
898
898
assert_frame_equal (df .resample ("2W-MON" , how = how )[["a" , "b" , "c" ]],
899
899
DataFrame ({"a" : [0 , 48 , 720 , 1394 ],
900
900
"b" : [47 , 719 , 1393 , 1586 ],
901
901
"c" : [48 , 672 , 674 , 193 ]},
902
- index = date_range ('9/30/2013' , '11/11/2013' ,
902
+ index = date_range ('9/30/2013' , '11/11/2013' ,
903
903
freq = '2W-MON' , tz = 'Europe/Paris' )),
904
904
'2W-MON Frequency' )
905
905
906
906
assert_frame_equal (df .resample ("MS" , how = how )[["a" , "b" , "c" ]],
907
907
DataFrame ({"a" : [0 , 48 , 1538 ],
908
908
"b" : [47 , 1537 , 1586 ],
909
909
"c" : [48 , 1490 , 49 ]},
910
- index = date_range ('9/1/2013' , '11/1/2013' ,
910
+ index = date_range ('9/1/2013' , '11/1/2013' ,
911
911
freq = 'MS' , tz = 'Europe/Paris' )),
912
912
'MS Frequency' )
913
913
914
914
assert_frame_equal (df .resample ("2MS" , how = how )[["a" , "b" , "c" ]],
915
915
DataFrame ({"a" : [0 , 1538 ],
916
916
"b" : [1537 , 1586 ],
917
917
"c" : [1538 , 49 ]},
918
- index = date_range ('9/1/2013' , '11/1/2013' ,
918
+ index = date_range ('9/1/2013' , '11/1/2013' ,
919
919
freq = '2MS' , tz = 'Europe/Paris' )),
920
920
'2MS Frequency' )
921
921
@@ -1553,6 +1553,8 @@ def test_aggregate_with_nat(self):
1553
1553
expected .index = date_range (start = '2013-01-01' , freq = 'D' , periods = 5 , name = 'key' )
1554
1554
dt_result = getattr (dt_grouped , func )()
1555
1555
assert_series_equal (expected , dt_result )
1556
+ # GH 9925
1557
+ self .assertEqual (dt_result .index .name , 'key' )
1556
1558
1557
1559
# if NaT is included, 'var', 'std', 'mean', 'first','last' and 'nth' doesn't work yet
1558
1560
0 commit comments