From 558a0fd146e99b90415bd62e0c7195c10393761d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sun, 14 Nov 2021 10:51:33 -0800 Subject: [PATCH 1/2] Revert "CI: xfail tests failing on numpy dev (#44362)" This reverts commit d779366ce9157eb55eef9f162cdded0dca73b9df. --- pandas/core/arrays/sparse/scipy_sparse.py | 2 +- pandas/tests/arrays/sparse/test_array.py | 2 +- pandas/tests/window/test_rolling.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pandas/core/arrays/sparse/scipy_sparse.py b/pandas/core/arrays/sparse/scipy_sparse.py index c1b994d4bc4c7..3f69321ae98a6 100644 --- a/pandas/core/arrays/sparse/scipy_sparse.py +++ b/pandas/core/arrays/sparse/scipy_sparse.py @@ -181,7 +181,7 @@ def coo_to_sparse_series( Parameters ---------- - A : scipy.sparse.coo_matrix + A : scipy.sparse.coo.coo_matrix dense_index : bool, default False Returns diff --git a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py index cc48918981338..96021bfa18fb7 100644 --- a/pandas/tests/arrays/sparse/test_array.py +++ b/pandas/tests/arrays/sparse/test_array.py @@ -1255,7 +1255,7 @@ def test_to_coo( A, rows, cols = ss.sparse.to_coo( row_levels=(0, 1), column_levels=(2, 3), sort_labels=sort_labels ) - assert isinstance(A, scipy.sparse.coo_matrix) + assert isinstance(A, scipy.sparse.coo.coo_matrix) tm.assert_numpy_array_equal(A.toarray(), expected_A) assert rows == expected_rows assert cols == expected_cols diff --git a/pandas/tests/window/test_rolling.py b/pandas/tests/window/test_rolling.py index a638ecbe04936..b60f2e60e1035 100644 --- a/pandas/tests/window/test_rolling.py +++ b/pandas/tests/window/test_rolling.py @@ -1634,7 +1634,6 @@ def test_rolling_quantile_np_percentile(): tm.assert_almost_equal(df_quantile.values, np.array(np_percentile)) -@pytest.mark.xfail(reason="GH#44343", strict=False) @pytest.mark.parametrize("quantile", [0.0, 0.1, 0.45, 0.5, 1]) @pytest.mark.parametrize( "interpolation", ["linear", "lower", "higher", "nearest", "midpoint"] From d19cbbae89ad190af32d48eda2a4934b7dbe9451 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sun, 14 Nov 2021 20:56:41 -0800 Subject: [PATCH 2/2] don't revert everything --- pandas/core/arrays/sparse/scipy_sparse.py | 2 +- pandas/tests/arrays/sparse/test_array.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/arrays/sparse/scipy_sparse.py b/pandas/core/arrays/sparse/scipy_sparse.py index 3f69321ae98a6..c1b994d4bc4c7 100644 --- a/pandas/core/arrays/sparse/scipy_sparse.py +++ b/pandas/core/arrays/sparse/scipy_sparse.py @@ -181,7 +181,7 @@ def coo_to_sparse_series( Parameters ---------- - A : scipy.sparse.coo.coo_matrix + A : scipy.sparse.coo_matrix dense_index : bool, default False Returns diff --git a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py index 96021bfa18fb7..cc48918981338 100644 --- a/pandas/tests/arrays/sparse/test_array.py +++ b/pandas/tests/arrays/sparse/test_array.py @@ -1255,7 +1255,7 @@ def test_to_coo( A, rows, cols = ss.sparse.to_coo( row_levels=(0, 1), column_levels=(2, 3), sort_labels=sort_labels ) - assert isinstance(A, scipy.sparse.coo.coo_matrix) + assert isinstance(A, scipy.sparse.coo_matrix) tm.assert_numpy_array_equal(A.toarray(), expected_A) assert rows == expected_rows assert cols == expected_cols