Skip to content

Commit dfd154d

Browse files
authored
Merge branch 'master' into assign_err
2 parents 5404817 + 7c2d28c commit dfd154d

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

asv_bench/asv.conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
// followed by the pip installed packages).
4040
"matrix": {
4141
"numpy": [],
42-
"Cython": ["0.29.21"],
42+
"Cython": ["0.29.24"],
4343
"matplotlib": [],
4444
"sqlalchemy": [],
4545
"scipy": [],

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
# The compiler packages are meta-packages and install the correct compiler (activation) packages on the respective platforms.
1616
- c-compiler
1717
- cxx-compiler
18-
- cython>=0.29.21
18+
- cython>=0.29.24
1919

2020
# code checks
2121
- black=21.5b2

pandas/core/arrays/sparse/scipy_sparse.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def coo_to_sparse_series(
181181
182182
Parameters
183183
----------
184-
A : scipy.sparse.coo.coo_matrix
184+
A : scipy.sparse.coo_matrix
185185
dense_index : bool, default False
186186
187187
Returns

pandas/tests/arrays/sparse/test_array.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ def test_to_coo(
12551255
A, rows, cols = ss.sparse.to_coo(
12561256
row_levels=(0, 1), column_levels=(2, 3), sort_labels=sort_labels
12571257
)
1258-
assert isinstance(A, scipy.sparse.coo.coo_matrix)
1258+
assert isinstance(A, scipy.sparse.coo_matrix)
12591259
tm.assert_numpy_array_equal(A.toarray(), expected_A)
12601260
assert rows == expected_rows
12611261
assert cols == expected_cols

pandas/tests/window/test_rolling.py

+1
Original file line numberDiff line numberDiff line change
@@ -1634,6 +1634,7 @@ def test_rolling_quantile_np_percentile():
16341634
tm.assert_almost_equal(df_quantile.values, np.array(np_percentile))
16351635

16361636

1637+
@pytest.mark.xfail(reason="GH#44343", strict=False)
16371638
@pytest.mark.parametrize("quantile", [0.0, 0.1, 0.45, 0.5, 1])
16381639
@pytest.mark.parametrize(
16391640
"interpolation", ["linear", "lower", "higher", "nearest", "midpoint"]

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ numpy>=1.18.5
55
python-dateutil>=2.8.1
66
pytz
77
asv
8-
cython>=0.29.21
8+
cython>=0.29.24
99
black==21.5b2
1010
cpplint
1111
flake8==3.9.2

0 commit comments

Comments
 (0)