From fcf7abbbd1ef29e1f39c1507ef22566f89333ea4 Mon Sep 17 00:00:00 2001 From: Alistair Date: Mon, 8 Nov 2021 23:06:15 +0000 Subject: [PATCH 1/4] CI fixes --- pandas/core/arrays/sparse/scipy_sparse.py | 2 +- pandas/tests/arrays/sparse/test_array.py | 2 +- pandas/tests/window/moments/test_moments_rolling.py | 1 + 3 files changed, 3 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 3a3103b095e45..dc29dc400df97 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 diff --git a/pandas/tests/window/moments/test_moments_rolling.py b/pandas/tests/window/moments/test_moments_rolling.py index b2e53a676b039..d29e9f5443396 100644 --- a/pandas/tests/window/moments/test_moments_rolling.py +++ b/pandas/tests/window/moments/test_moments_rolling.py @@ -558,6 +558,7 @@ def test_rolling_quantile_np_percentile(): tm.assert_almost_equal(df_quantile.values, np.array(np_percentile)) +@pytest.mark.xfail(reason="GH#44343") @pytest.mark.parametrize("quantile", [0.0, 0.1, 0.45, 0.5, 1]) @pytest.mark.parametrize( "interpolation", ["linear", "lower", "higher", "nearest", "midpoint"] From a34e80f5b5de0944d02e1d9b92eaba3d76e0c723 Mon Sep 17 00:00:00 2001 From: Alistair Date: Mon, 8 Nov 2021 23:10:52 +0000 Subject: [PATCH 2/4] xfail --- pandas/tests/window/test_rolling.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/window/test_rolling.py b/pandas/tests/window/test_rolling.py index 0c0288b49c930..3294489b85a0e 100644 --- a/pandas/tests/window/test_rolling.py +++ b/pandas/tests/window/test_rolling.py @@ -1634,6 +1634,7 @@ def test_rolling_quantile_np_percentile(): tm.assert_almost_equal(df_quantile.values, np.array(np_percentile)) +@pytest.mark.xfail(reason="GH#44343") @pytest.mark.parametrize("quantile", [0.0, 0.1, 0.45, 0.5, 1]) @pytest.mark.parametrize( "interpolation", ["linear", "lower", "higher", "nearest", "midpoint"] From dd3271194016e354e252c477dfe3c6cf39ab671d Mon Sep 17 00:00:00 2001 From: Alistair Date: Mon, 8 Nov 2021 23:12:07 +0000 Subject: [PATCH 3/4] merge master --- pandas/tests/window/moments/test_moments_rolling.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pandas/tests/window/moments/test_moments_rolling.py diff --git a/pandas/tests/window/moments/test_moments_rolling.py b/pandas/tests/window/moments/test_moments_rolling.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 From 6f76e1b53f30313c3f2e2dabf850a49eaa93172f Mon Sep 17 00:00:00 2001 From: Alistair Date: Mon, 8 Nov 2021 23:47:58 +0000 Subject: [PATCH 4/4] Strict = False --- pandas/tests/window/test_rolling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/window/test_rolling.py b/pandas/tests/window/test_rolling.py index 3294489b85a0e..27b06e78d8ce2 100644 --- a/pandas/tests/window/test_rolling.py +++ b/pandas/tests/window/test_rolling.py @@ -1634,7 +1634,7 @@ def test_rolling_quantile_np_percentile(): tm.assert_almost_equal(df_quantile.values, np.array(np_percentile)) -@pytest.mark.xfail(reason="GH#44343") +@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"]