Skip to content

Commit 1c8199f

Browse files
authored
CI/TST: numpy 1.22.3 release fixes (#46274)
1 parent d0cf9b5 commit 1c8199f

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

pandas/core/indexes/multi.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1088,9 +1088,7 @@ def _engine(self):
10881088
# equivalent to sorting lexicographically the codes themselves. Notice
10891089
# that each level needs to be shifted by the number of bits needed to
10901090
# represent the _previous_ ones:
1091-
offsets = np.concatenate([lev_bits[1:], [0]]).astype( # type: ignore[arg-type]
1092-
"uint64"
1093-
)
1091+
offsets = np.concatenate([lev_bits[1:], [0]]).astype("uint64")
10941092

10951093
# Check the total number of bits needed for our representation:
10961094
if lev_bits[0] > 64:

pandas/tests/frame/test_ufunc.py

-6
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,6 @@ def test_alignment_deprecation_many_inputs(request):
263263
)
264264

265265
if np_version_gte1p22:
266-
mark = pytest.mark.xfail(
267-
reason="ufunc 'my_ufunc' did not contain a loop with signature matching "
268-
"types",
269-
)
270-
request.node.add_marker(mark)
271-
272266
mark = pytest.mark.filterwarnings(
273267
"ignore:`np.MachAr` is deprecated.*:DeprecationWarning"
274268
)

0 commit comments

Comments
 (0)