Skip to content

Commit 6be4c9c

Browse files
phoflJulianWgs
authored andcommitted
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)" (pandas-dev#41015)
This reverts commit 895f0b4
1 parent 4b54433 commit 6be4c9c

File tree

3 files changed

+1
-30
lines changed

3 files changed

+1
-30
lines changed

pandas/tests/arrays/boolean/test_arithmetic.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ def test_div(left_array, right_array):
6969
@pytest.mark.parametrize(
7070
"opname",
7171
[
72-
pytest.param(
73-
"floordiv",
74-
marks=pytest.mark.xfail(reason="NumpyDev GH#40874", strict=False),
75-
),
72+
"floordiv",
7673
"mod",
7774
pytest.param(
7875
"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
@@ -6,8 +6,6 @@
66
import numpy as np
77
import pytest
88

9-
from pandas.compat import is_numpy_dev
10-
119
import pandas as pd
1210
import pandas._testing as tm
1311
from pandas.core.arrays import ExtensionArray
@@ -54,8 +52,6 @@ def test_array_scalar_like_equivalence(data, all_arithmetic_operators):
5452
def test_array_NA(data, all_arithmetic_operators):
5553
if "truediv" in all_arithmetic_operators:
5654
pytest.skip("division with pd.NA raises")
57-
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
58-
pytest.skip("NumpyDev behavior GH#40874")
5955
data, _ = data
6056
op = tm.get_op_from_name(all_arithmetic_operators)
6157
check_skip(data, all_arithmetic_operators)

pandas/tests/extension/test_boolean.py

-22
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 import is_numpy_dev
20-
2119
import pandas as pd
2220
import pandas._testing as tm
2321
from pandas.core.arrays.boolean import BooleanDtype
@@ -142,26 +140,6 @@ def _check_op(self, obj, op, other, op_name, exc=NotImplementedError):
142140
with pytest.raises(exc):
143141
op(obj, other)
144142

145-
def test_arith_series_with_scalar(self, data, all_arithmetic_operators):
146-
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
147-
pytest.skip("NumpyDev behavior GH#40874")
148-
super().test_arith_series_with_scalar(data, all_arithmetic_operators)
149-
150-
def test_arith_frame_with_scalar(self, data, all_arithmetic_operators):
151-
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
152-
pytest.skip("NumpyDev behavior GH#40874")
153-
super().test_arith_frame_with_scalar(data, all_arithmetic_operators)
154-
155-
def test_arith_series_with_array(self, data, all_arithmetic_operators):
156-
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
157-
pytest.skip("NumpyDev behavior GH#40874")
158-
super().test_arith_series_with_scalar(data, all_arithmetic_operators)
159-
160-
def test_divmod_series_array(self, data, data_for_twos):
161-
if is_numpy_dev:
162-
pytest.skip("NumpyDev behavior GH#40874")
163-
super().test_divmod_series_array(data, data_for_twos)
164-
165143
def _check_divmod_op(self, s, op, other, exc=None):
166144
# override to not raise an error
167145
super()._check_divmod_op(s, op, other, None)

0 commit comments

Comments
 (0)