Skip to content

CI: remove xfail for numpy-dev on branch 1.1.x only #37082

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.

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
Changes from all commits
Commits
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
12 changes: 1 addition & 11 deletions pandas/tests/indexes/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import pytest

from pandas._libs import iNaT
from pandas.compat.numpy import _is_numpy_dev
from pandas.errors import InvalidIndexError

from pandas.core.dtypes.common import is_datetime64tz_dtype
Expand Down Expand Up @@ -418,7 +417,7 @@ def test_set_ops_error_cases(self, case, method, index):
with pytest.raises(TypeError, match=msg):
getattr(index, method)(case)

def test_intersection_base(self, index, request):
def test_intersection_base(self, index):
if isinstance(index, CategoricalIndex):
return

Expand All @@ -435,15 +434,6 @@ def test_intersection_base(self, index, request):
# GH 10149
cases = [klass(second.values) for klass in [np.array, Series, list]]
for case in cases:
# https://github.com/pandas-dev/pandas/issues/35481
if (
_is_numpy_dev
and isinstance(case, Series)
and isinstance(index, UInt64Index)
):
mark = pytest.mark.xfail(reason="gh-35481")
request.node.add_marker(mark)

result = first.intersection(case)
assert tm.equalContents(result, second)

Expand Down