Skip to content

Backport PR #41015 on branch 1.2.x (Revert "Skipt failing tests for numpy dev (#40877)") #41019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 18, 2021
Merged

Backport PR #41015 on branch 1.2.x (Revert "Skipt failing tests for numpy dev (#40877)") #41019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
284c315
Revert "Skipt failing tests for numpy dev (#40877)" (#41015)
phofl Apr 18, 2021
e24786a
Add accidentially deleted code back in
phofl Apr 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pandas/tests/arrays/boolean/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import numpy as np
import pytest

from pandas.compat.numpy import is_numpy_dev

import pandas as pd
import pandas._testing as tm
from pandas.core.arrays import ExtensionArray
Expand Down Expand Up @@ -51,8 +49,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
17 changes: 0 additions & 17 deletions pandas/tests/extension/test_boolean.py
View file
Open in desktop
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.numpy import is_numpy_dev

import pandas as pd
import pandas._testing as tm
from pandas.core.arrays.boolean import BooleanDtype
Expand Down Expand Up @@ -141,21 +139,6 @@ def _check_op(self, s, op, other, op_name, exc=NotImplementedError):
with pytest.raises(exc):
op(s, 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_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