Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove dask-expr from CI runs, fix related tests #9971

Merged
merged 3 commits into from
Jan 22, 2025
Merged

remove dask-expr from CI runs, fix related tests #9971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d6052e
remove dask-expr from CI runs, fix related tests
kmuehlbauer Jan 22, 2025
32dc891
Explicitely add pyarrow to windows builds, as importing dask.datafram…
kmuehlbauer Jan 22, 2025
cb79784
add whats-new.rst entry
kmuehlbauer Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/requirements/all-but-numba.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dependencies:
- cartopy
- cftime
- dask-core
- dask-expr # dask raises a deprecation warning without this, breaking doctests
- distributed
- flox
- fsspec
Expand Down
1 change: 0 additions & 1 deletion ci/requirements/doc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- cfgrib
- kerchunk
- dask-core>=2022.1
- dask-expr
- hypothesis>=6.75.8
- h5netcdf>=0.13
- ipykernel
Expand Down
1 change: 0 additions & 1 deletion ci/requirements/environment-3.13.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- cartopy
- cftime
- dask-core
- dask-expr
- distributed
- flox
- fsspec
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/environment-windows-3.13.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- cartopy
- cftime
- dask-core
- dask-expr
- distributed
- flox
- fsspec
Expand All @@ -29,6 +28,7 @@ dependencies:
# - pint>=0.22
- pip
- pre-commit
- pyarrow # importing dask.dataframe raises an ImportError without this
- pydap
- pytest
- pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/environment-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- cartopy
- cftime
- dask-core
- dask-expr
- distributed
- flox
- fsspec
Expand All @@ -29,6 +28,7 @@ dependencies:
# - pint>=0.22
- pip
- pre-commit
- pyarrow # importing dask.dataframe raises an ImportError without this
- pydap
- pytest
- pytest-cov
Expand Down
1 change: 0 additions & 1 deletion ci/requirements/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- cartopy
- cftime
- dask-core
- dask-expr # dask raises a deprecation warning without this, breaking doctests
- distributed
- flox
- fsspec
Expand Down
3 changes: 2 additions & 1 deletion doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ Bug fixes
~~~~~~~~~
- Fix issues related to Pandas v3 ("us" vs. "ns" for python datetime, copy on write) and handling of 0d-numpy arrays in datetime/timedelta decoding (:pull:`9953`).
By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.

- Remove dask-expr from CI runs, add "pyarrow" dask dependency to windows CI runs, fix related tests (:issue:`9962`, :pull:`9971`).
By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.

Documentation
~~~~~~~~~~~~~
Expand Down
19 changes: 12 additions & 7 deletions xarray/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,18 @@ def _importorskip(
"dask", minversion="2024.08.1"
)
has_dask_ge_2024_11_0, requires_dask_ge_2024_11_0 = _importorskip("dask", "2024.11.0")
with warnings.catch_warnings():
warnings.filterwarnings(
"ignore",
message="The current Dask DataFrame implementation is deprecated.",
category=DeprecationWarning,
)
has_dask_expr, requires_dask_expr = _importorskip("dask_expr")
has_dask_ge_2025_1_0, requires_dask_ge_2025_1_0 = _importorskip("dask", "2025.1.0")
if has_dask_ge_2025_1_0:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if-clause is looking a bit weird. At least it's backwards compatible and will be removed anyway if the minimum dask version is 2025.1.0.

has_dask_expr = True
requires_dask_expr = pytest.mark.skipif(not has_dask_expr, reason="should not skip")
else:
with warnings.catch_warnings():
warnings.filterwarnings(
"ignore",
message="The current Dask DataFrame implementation is deprecated.",
category=DeprecationWarning,
)
has_dask_expr, requires_dask_expr = _importorskip("dask_expr")
has_bottleneck, requires_bottleneck = _importorskip("bottleneck")
has_rasterio, requires_rasterio = _importorskip("rasterio")
has_zarr, requires_zarr = _importorskip("zarr")
Expand Down
3 changes: 2 additions & 1 deletion xarray/tests/test_dataarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
assert_identical,
assert_no_warnings,
has_dask,
has_dask_ge_2025_1_0,
raise_if_dask_computes,
requires_bottleneck,
requires_cupy,
Expand Down Expand Up @@ -3437,7 +3438,7 @@ def test_to_dataframe_0length(self) -> None:

@requires_dask_expr
@requires_dask
@pytest.mark.xfail(reason="dask-expr is broken")
@pytest.mark.xfail(not has_dask_ge_2025_1_0, reason="dask-expr is broken")
def test_to_dask_dataframe(self) -> None:
arr_np = np.arange(3 * 4).reshape(3, 4)
arr = DataArray(arr_np, [("B", [1, 2, 3]), ("A", list("cdef"))], name="foo")
Expand Down
Loading