@@ -1060,54 +1060,14 @@ def test_any_all_bool_only(self):
1060
1060
(np .any , {"A" : pd .Series ([0.0 , 1.0 ], dtype = "float" )}, True ),
1061
1061
(np .all , {"A" : pd .Series ([0 , 1 ], dtype = int )}, False ),
1062
1062
(np .any , {"A" : pd .Series ([0 , 1 ], dtype = int )}, True ),
1063
- pytest .param (
1064
- np .all ,
1065
- {"A" : pd .Series ([0 , 1 ], dtype = "M8[ns]" )},
1066
- False ,
1067
- marks = [td .skip_if_np_lt ("1.15" )],
1068
- ),
1069
- pytest .param (
1070
- np .any ,
1071
- {"A" : pd .Series ([0 , 1 ], dtype = "M8[ns]" )},
1072
- True ,
1073
- marks = [td .skip_if_np_lt ("1.15" )],
1074
- ),
1075
- pytest .param (
1076
- np .all ,
1077
- {"A" : pd .Series ([1 , 2 ], dtype = "M8[ns]" )},
1078
- True ,
1079
- marks = [td .skip_if_np_lt ("1.15" )],
1080
- ),
1081
- pytest .param (
1082
- np .any ,
1083
- {"A" : pd .Series ([1 , 2 ], dtype = "M8[ns]" )},
1084
- True ,
1085
- marks = [td .skip_if_np_lt ("1.15" )],
1086
- ),
1087
- pytest .param (
1088
- np .all ,
1089
- {"A" : pd .Series ([0 , 1 ], dtype = "m8[ns]" )},
1090
- False ,
1091
- marks = [td .skip_if_np_lt ("1.15" )],
1092
- ),
1093
- pytest .param (
1094
- np .any ,
1095
- {"A" : pd .Series ([0 , 1 ], dtype = "m8[ns]" )},
1096
- True ,
1097
- marks = [td .skip_if_np_lt ("1.15" )],
1098
- ),
1099
- pytest .param (
1100
- np .all ,
1101
- {"A" : pd .Series ([1 , 2 ], dtype = "m8[ns]" )},
1102
- True ,
1103
- marks = [td .skip_if_np_lt ("1.15" )],
1104
- ),
1105
- pytest .param (
1106
- np .any ,
1107
- {"A" : pd .Series ([1 , 2 ], dtype = "m8[ns]" )},
1108
- True ,
1109
- marks = [td .skip_if_np_lt ("1.15" )],
1110
- ),
1063
+ pytest .param (np .all , {"A" : pd .Series ([0 , 1 ], dtype = "M8[ns]" )}, False ,),
1064
+ pytest .param (np .any , {"A" : pd .Series ([0 , 1 ], dtype = "M8[ns]" )}, True ,),
1065
+ pytest .param (np .all , {"A" : pd .Series ([1 , 2 ], dtype = "M8[ns]" )}, True ,),
1066
+ pytest .param (np .any , {"A" : pd .Series ([1 , 2 ], dtype = "M8[ns]" )}, True ,),
1067
+ pytest .param (np .all , {"A" : pd .Series ([0 , 1 ], dtype = "m8[ns]" )}, False ,),
1068
+ pytest .param (np .any , {"A" : pd .Series ([0 , 1 ], dtype = "m8[ns]" )}, True ,),
1069
+ pytest .param (np .all , {"A" : pd .Series ([1 , 2 ], dtype = "m8[ns]" )}, True ,),
1070
+ pytest .param (np .any , {"A" : pd .Series ([1 , 2 ], dtype = "m8[ns]" )}, True ,),
1111
1071
(np .all , {"A" : pd .Series ([0 , 1 ], dtype = "category" )}, False ),
1112
1072
(np .any , {"A" : pd .Series ([0 , 1 ], dtype = "category" )}, True ),
1113
1073
(np .all , {"A" : pd .Series ([1 , 2 ], dtype = "category" )}, True ),
@@ -1120,8 +1080,6 @@ def test_any_all_bool_only(self):
1120
1080
"B" : pd .Series ([10 , 20 ], dtype = "m8[ns]" ),
1121
1081
},
1122
1082
True ,
1123
- # In 1.13.3 and 1.14 np.all(df) returns a Timedelta here
1124
- marks = [td .skip_if_np_lt ("1.15" )],
1125
1083
),
1126
1084
],
1127
1085
)
0 commit comments