Skip to content

Commit 284c315

Browse files
committed
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)" (pandas-dev#41015)
This reverts commit 895f0b4 (cherry picked from commit 70435eb)
1 parent 5e72db0 commit 284c315

File tree

3 files changed

+1
-38
lines changed

3 files changed

+1
-38
lines changed

pandas/tests/arrays/boolean/test_arithmetic.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ def test_div(left_array, right_array):
6666
@pytest.mark.parametrize(
6767
"opname",
6868
[
69-
pytest.param(
70-
"floordiv",
71-
marks=pytest.mark.xfail(reason="NumpyDev GH#40874", strict=False),
72-
),
69+
"floordiv",
7370
"mod",
7471
pytest.param(
7572
"pow", marks=pytest.mark.xfail(reason="TODO follow int8 behaviour? GH34686")

pandas/tests/arrays/masked/test_arithmetic.py

-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.compat.numpy import is_numpy_dev
7-
86
import pandas as pd
97
import pandas._testing as tm
108
from pandas.core.arrays import ExtensionArray
@@ -51,8 +49,6 @@ def test_array_scalar_like_equivalence(data, all_arithmetic_operators):
5149
def test_array_NA(data, all_arithmetic_operators):
5250
if "truediv" in all_arithmetic_operators:
5351
pytest.skip("division with pd.NA raises")
54-
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
55-
pytest.skip("NumpyDev behavior GH#40874")
5652
data, _ = data
5753
op = tm.get_op_from_name(all_arithmetic_operators)
5854
check_skip(data, all_arithmetic_operators)

pandas/tests/extension/test_boolean.py

-30
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import numpy as np
1717
import pytest
1818

19-
from pandas.compat.numpy import is_numpy_dev
20-
2119
import pandas as pd
2220
import pandas._testing as tm
2321
from pandas.core.arrays.boolean import BooleanDtype
@@ -141,38 +139,10 @@ def _check_op(self, s, op, other, op_name, exc=NotImplementedError):
141139
with pytest.raises(exc):
142140
op(s, other)
143141

144-
def test_arith_series_with_scalar(self, data, all_arithmetic_operators):
145-
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
146-
pytest.skip("NumpyDev behavior GH#40874")
147-
super().test_arith_series_with_scalar(data, all_arithmetic_operators)
148-
149-
def test_arith_series_with_array(self, data, all_arithmetic_operators):
150-
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
151-
pytest.skip("NumpyDev behavior GH#40874")
152-
super().test_arith_series_with_scalar(data, all_arithmetic_operators)
153-
154-
def test_divmod_series_array(self, data, data_for_twos):
155-
if is_numpy_dev:
156-
pytest.skip("NumpyDev behavior GH#40874")
157-
super().test_divmod_series_array(data, data_for_twos)
158-
159142
def _check_divmod_op(self, s, op, other, exc=None):
160143
# override to not raise an error
161144
super()._check_divmod_op(s, op, other, None)
162145

163-
@pytest.mark.skip(reason="BooleanArray does not error on ops")
164-
def test_error(self, data, all_arithmetic_operators):
165-
# other specific errors tested in the boolean array specific tests
166-
pass
167-
168-
def test_arith_frame_with_scalar(self, data, all_arithmetic_operators, request):
169-
# frame & scalar
170-
op_name = all_arithmetic_operators
171-
if op_name not in self.implements:
172-
mark = pytest.mark.xfail(reason="_reduce needs implementation")
173-
request.node.add_marker(mark)
174-
super().test_arith_frame_with_scalar(data, all_arithmetic_operators)
175-
176146

177147
class TestComparisonOps(base.BaseComparisonOpsTests):
178148
def check_opname(self, s, op_name, other, exc=None):

0 commit comments

Comments
 (0)