From 0f073be07e923b049cef4eb05ee6cb87ca03a7bb Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Tue, 8 Mar 2022 18:17:40 -0800 Subject: [PATCH] Backport PR #46274: CI/TST: numpy 1.22.3 release fixes --- pandas/core/indexes/multi.py | 4 +--- pandas/tests/frame/test_ufunc.py | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pandas/core/indexes/multi.py b/pandas/core/indexes/multi.py index dcb8437f30c9e..1168325378e92 100644 --- a/pandas/core/indexes/multi.py +++ b/pandas/core/indexes/multi.py @@ -1088,9 +1088,7 @@ def _engine(self): # equivalent to sorting lexicographically the codes themselves. Notice # that each level needs to be shifted by the number of bits needed to # represent the _previous_ ones: - offsets = np.concatenate([lev_bits[1:], [0]]).astype( # type: ignore[arg-type] - "uint64" - ) + offsets = np.concatenate([lev_bits[1:], [0]]).astype("uint64") # Check the total number of bits needed for our representation: if lev_bits[0] > 64: diff --git a/pandas/tests/frame/test_ufunc.py b/pandas/tests/frame/test_ufunc.py index 79e9b1f34978d..22f1745ba9dd1 100644 --- a/pandas/tests/frame/test_ufunc.py +++ b/pandas/tests/frame/test_ufunc.py @@ -263,12 +263,6 @@ def test_alignment_deprecation_many_inputs(request): ) if np_version_gte1p22: - mark = pytest.mark.xfail( - reason="ufunc 'my_ufunc' did not contain a loop with signature matching " - "types", - ) - request.node.add_marker(mark) - mark = pytest.mark.filterwarnings( "ignore:`np.MachAr` is deprecated.*:DeprecationWarning" )