Skip to content

Commit f7d081f

Browse files
Revert "Backport PR #35502: CI: xfail numpy-dev (#35537)"
This reverts commit 69165d1.
1 parent 42c2c74 commit f7d081f

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

pandas/tests/indexes/common.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import pytest
66

77
from pandas._libs import iNaT
8-
from pandas.compat.numpy import _is_numpy_dev
98
from pandas.errors import InvalidIndexError
109

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

421-
def test_intersection_base(self, index, request):
420+
def test_intersection_base(self, index):
422421
if isinstance(index, CategoricalIndex):
423422
return
424423

@@ -435,15 +434,6 @@ def test_intersection_base(self, index, request):
435434
# GH 10149
436435
cases = [klass(second.values) for klass in [np.array, Series, list]]
437436
for case in cases:
438-
# https://github.com/pandas-dev/pandas/issues/35481
439-
if (
440-
_is_numpy_dev
441-
and isinstance(case, Series)
442-
and isinstance(index, UInt64Index)
443-
):
444-
mark = pytest.mark.xfail(reason="gh-35481")
445-
request.node.add_marker(mark)
446-
447437
result = first.intersection(case)
448438
assert tm.equalContents(result, second)
449439

pandas/tests/indexing/test_loc.py

-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import numpy as np
66
import pytest
77

8-
from pandas.compat.numpy import _is_numpy_dev
9-
108
import pandas as pd
119
from pandas import DataFrame, Series, Timestamp, date_range
1210
import pandas._testing as tm
@@ -947,7 +945,6 @@ def test_loc_setitem_empty_append(self):
947945
df.loc[0, "x"] = expected.loc[0, "x"]
948946
tm.assert_frame_equal(df, expected)
949947

950-
@pytest.mark.xfail(_is_numpy_dev, reason="gh-35481")
951948
def test_loc_setitem_empty_append_raises(self):
952949
# GH6173, various appends to an empty dataframe
953950

0 commit comments

Comments
 (0)