@@ -441,14 +441,13 @@ def test_merge_datetime_index(self, klass):
441
441
if klass is not None :
442
442
on_vector = klass (on_vector )
443
443
444
- expected = DataFrame ({"a" : [1 , 2 , 3 ], "key_1" : [2016 , 2017 , 2018 ]})
444
+ exp_years = np .array ([2016 , 2017 , 2018 ], dtype = np .int32 )
445
+ expected = DataFrame ({"a" : [1 , 2 , 3 ], "key_1" : exp_years })
445
446
446
447
result = df .merge (df , on = ["a" , on_vector ], how = "inner" )
447
448
tm .assert_frame_equal (result , expected )
448
449
449
- expected = DataFrame (
450
- {"key_0" : [2016 , 2017 , 2018 ], "a_x" : [1 , 2 , 3 ], "a_y" : [1 , 2 , 3 ]}
451
- )
450
+ expected = DataFrame ({"key_0" : exp_years , "a_x" : [1 , 2 , 3 ], "a_y" : [1 , 2 , 3 ]})
452
451
453
452
result = df .merge (df , on = [df .index .year ], how = "inner" )
454
453
tm .assert_frame_equal (result , expected )
@@ -852,14 +851,13 @@ def test_merge_datetime_index(self, box):
852
851
if box is not None :
853
852
on_vector = box (on_vector )
854
853
855
- expected = DataFrame ({"a" : [1 , 2 , 3 ], "key_1" : [2016 , 2017 , 2018 ]})
854
+ exp_years = np .array ([2016 , 2017 , 2018 ], dtype = np .int32 )
855
+ expected = DataFrame ({"a" : [1 , 2 , 3 ], "key_1" : exp_years })
856
856
857
857
result = df .merge (df , on = ["a" , on_vector ], how = "inner" )
858
858
tm .assert_frame_equal (result , expected )
859
859
860
- expected = DataFrame (
861
- {"key_0" : [2016 , 2017 , 2018 ], "a_x" : [1 , 2 , 3 ], "a_y" : [1 , 2 , 3 ]}
862
- )
860
+ expected = DataFrame ({"key_0" : exp_years , "a_x" : [1 , 2 , 3 ], "a_y" : [1 , 2 , 3 ]})
863
861
864
862
result = df .merge (df , on = [df .index .year ], how = "inner" )
865
863
tm .assert_frame_equal (result , expected )
0 commit comments