From df0703bc0895f2d44b08645e4a78611f49c9f049 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Tue, 8 Mar 2022 11:51:31 -0800 Subject: [PATCH 1/2] CI/TST: Remove xfail for xpassing numpy test --- pandas/tests/frame/test_ufunc.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pandas/tests/frame/test_ufunc.py b/pandas/tests/frame/test_ufunc.py index 2a4b212d0acd7..b884224315a61 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" ) From fb51061edb02692c950a06533f31790535f2a04b Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Tue, 8 Mar 2022 13:34:22 -0800 Subject: [PATCH 2/2] Fix typing as well --- pandas/core/indexes/multi.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/core/indexes/multi.py b/pandas/core/indexes/multi.py index f40857059a794..cdde510927081 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: