Skip to content

Commit

Permalink
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)" (pandas…
Browse files Browse the repository at this point in the history
…-dev#41015)

This reverts commit 895f0b4
  • Loading branch information
phofl authored Apr 18, 2021
1 parent 04f9a4b commit 70435eb
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 30 deletions.
5 changes: 1 addition & 4 deletions pandas/tests/arrays/boolean/test_arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ def test_div(left_array, right_array):
@pytest.mark.parametrize(
"opname",
[
pytest.param(
"floordiv",
marks=pytest.mark.xfail(reason="NumpyDev GH#40874", strict=False),
),
"floordiv",
"mod",
pytest.param(
"pow", marks=pytest.mark.xfail(reason="TODO follow int8 behaviour? GH34686")
Expand Down
4 changes: 0 additions & 4 deletions pandas/tests/arrays/masked/test_arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import numpy as np
import pytest

from pandas.compat import is_numpy_dev

import pandas as pd
import pandas._testing as tm
from pandas.core.arrays import ExtensionArray
Expand Down Expand Up @@ -54,8 +52,6 @@ def test_array_scalar_like_equivalence(data, all_arithmetic_operators):
def test_array_NA(data, all_arithmetic_operators):
if "truediv" in all_arithmetic_operators:
pytest.skip("division with pd.NA raises")
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
pytest.skip("NumpyDev behavior GH#40874")
data, _ = data
op = tm.get_op_from_name(all_arithmetic_operators)
check_skip(data, all_arithmetic_operators)
Expand Down
22 changes: 0 additions & 22 deletions pandas/tests/extension/test_boolean.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import numpy as np
import pytest

from pandas.compat import is_numpy_dev

import pandas as pd
import pandas._testing as tm
from pandas.core.arrays.boolean import BooleanDtype
Expand Down Expand Up @@ -142,26 +140,6 @@ def _check_op(self, obj, op, other, op_name, exc=NotImplementedError):
with pytest.raises(exc):
op(obj, other)

def test_arith_series_with_scalar(self, data, all_arithmetic_operators):
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
pytest.skip("NumpyDev behavior GH#40874")
super().test_arith_series_with_scalar(data, all_arithmetic_operators)

def test_arith_frame_with_scalar(self, data, all_arithmetic_operators):
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
pytest.skip("NumpyDev behavior GH#40874")
super().test_arith_frame_with_scalar(data, all_arithmetic_operators)

def test_arith_series_with_array(self, data, all_arithmetic_operators):
if "floordiv" in all_arithmetic_operators and is_numpy_dev:
pytest.skip("NumpyDev behavior GH#40874")
super().test_arith_series_with_scalar(data, all_arithmetic_operators)

def test_divmod_series_array(self, data, data_for_twos):
if is_numpy_dev:
pytest.skip("NumpyDev behavior GH#40874")
super().test_divmod_series_array(data, data_for_twos)

def _check_divmod_op(self, s, op, other, exc=None):
# override to not raise an error
super()._check_divmod_op(s, op, other, None)
Expand Down

0 comments on commit 70435eb

Please sign in to comment.