@@ -1029,22 +1029,20 @@ def test_replace_series(self, how, to_key, from_key):
10291029
10301030 tm .assert_series_equal (result , exp )
10311031
1032- # TODO(jbrockmendel) commented out to only have a single xfail printed
1033- @pytest .mark .xfail (
1034- reason = "GH #18376, tzawareness-compat bug in BlockManager.replace_list"
1032+ @pytest .mark .parametrize ("how" , ["dict" , "series" ])
1033+ @pytest .mark .parametrize (
1034+ "to_key" ,
1035+ ["timedelta64[ns]" , "bool" , "object" , "complex128" , "float64" , "int64" ],
10351036 )
1036- # @pytest.mark.parametrize('how', ['dict', 'series'])
1037- # @pytest.mark.parametrize('to_key', ['timedelta64[ns]', 'bool', 'object',
1038- # 'complex128', 'float64', 'int64'])
1039- # @pytest.mark.parametrize('from_key', ['datetime64[ns, UTC]',
1040- # 'datetime64[ns, US/Eastern]'])
1041- # def test_replace_series_datetime_tz(self, how, to_key, from_key):
1042- def test_replace_series_datetime_tz (self ):
1037+ @pytest .mark .parametrize (
1038+ "from_key" , ["datetime64[ns, UTC]" , "datetime64[ns, US/Eastern]" ]
1039+ )
1040+ def test_replace_series_datetime_tz (self , how , to_key , from_key ):
10431041 how = "series"
10441042 from_key = "datetime64[ns, US/Eastern]"
10451043 to_key = "timedelta64[ns]"
10461044
1047- index = pd .Index ([3 , 4 ], name = "xxx " )
1045+ index = pd .Index ([3 , 4 ], name = "xyz " )
10481046 obj = pd .Series (self .rep [from_key ], index = index , name = "yyy" )
10491047 assert obj .dtype == from_key
10501048
@@ -1061,24 +1059,17 @@ def test_replace_series_datetime_tz(self):
10611059
10621060 tm .assert_series_equal (result , exp )
10631061
1064- # TODO(jreback) commented out to only have a single xfail printed
1065- @pytest .mark .xfail (
1066- reason = "different tz, currently mask_missing raises SystemError" , strict = False
1062+ @pytest .mark .parametrize ("how" , ["dict" , "series" ])
1063+ @pytest .mark .parametrize (
1064+ "to_key" ,
1065+ ["datetime64[ns]" , "datetime64[ns, UTC]" , "datetime64[ns, US/Eastern]" ],
10671066 )
1068- # @pytest.mark.parametrize('how', ['dict', 'series'])
1069- # @pytest.mark.parametrize('to_key', [
1070- # 'datetime64[ns]', 'datetime64[ns, UTC]',
1071- # 'datetime64[ns, US/Eastern]'])
1072- # @pytest.mark.parametrize('from_key', [
1073- # 'datetime64[ns]', 'datetime64[ns, UTC]',
1074- # 'datetime64[ns, US/Eastern]'])
1075- # def test_replace_series_datetime_datetime(self, how, to_key, from_key):
1076- def test_replace_series_datetime_datetime (self ):
1077- how = "dict"
1078- to_key = "datetime64[ns]"
1079- from_key = "datetime64[ns]"
1080-
1081- index = pd .Index ([3 , 4 ], name = "xxx" )
1067+ @pytest .mark .parametrize (
1068+ "from_key" ,
1069+ ["datetime64[ns]" , "datetime64[ns, UTC]" , "datetime64[ns, US/Eastern]" ],
1070+ )
1071+ def test_replace_series_datetime_datetime (self , how , to_key , from_key ):
1072+ index = pd .Index ([3 , 4 ], name = "xyz" )
10821073 obj = pd .Series (self .rep [from_key ], index = index , name = "yyy" )
10831074 assert obj .dtype == from_key
10841075
0 commit comments