Skip to content

Commit 7683084

Browse files
authored
Merge branch 'main' into ci/numpy
2 parents 6ef1a22 + c5ea524 commit 7683084

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

pandas/tests/test_downstream.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
TimedeltaIndex,
2121
)
2222
import pandas._testing as tm
23+
from pandas.util.version import Version
2324

2425

2526
@pytest.fixture
@@ -222,15 +223,22 @@ def test_missing_required_dependency():
222223
assert name in output
223224

224225

225-
def test_frame_setitem_dask_array_into_new_col():
226+
def test_frame_setitem_dask_array_into_new_col(request):
226227
# GH#47128
227228

228229
# dask sets "compute.use_numexpr" to False, so catch the current value
229230
# and ensure to reset it afterwards to avoid impacting other tests
230231
olduse = pd.get_option("compute.use_numexpr")
231232

232233
try:
234+
dask = pytest.importorskip("dask")
233235
da = pytest.importorskip("dask.array")
236+
if Version(dask.__version__) <= Version("2025.1.0") and Version(
237+
np.__version__
238+
) >= Version("2.1"):
239+
request.applymarker(
240+
pytest.mark.xfail(reason="loc.__setitem__ incorrectly mutated column c")
241+
)
234242

235243
dda = da.array([1, 2])
236244
df = DataFrame({"a": ["a", "b"]})

web/pandas/community/ecosystem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ developers to build powerful and more focused data tools. The creation
88
of libraries that complement pandas' functionality also allows pandas
99
development to remain focused around its original requirements.
1010

11-
This is an community-maintained list of projects that build on pandas in order
11+
This is a community-maintained list of projects that build on pandas in order
1212
to provide tools in the PyData space. The pandas core development team does not necessarily endorse any particular project on this list or have any knowledge of the maintenance status of any particular library.
1313

1414
For a more complete list of projects that depend on pandas, see the [libraries.io usage page for

0 commit comments

Comments
 (0)