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

Bump minimum version requirements for dask from 2.15 to 2.24 #5726

Merged
merged 5 commits into from
Aug 25, 2021
Merged

Bump minimum version requirements for dask from 2.15 to 2.24 #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a97c07d
Bump min requirements for dask
Illviljan Aug 21, 2021
2d34941
Update whats-new.rst
Illviljan Aug 21, 2021
df09393
Merge branch 'main' into bump_dask_min_reqs
Illviljan Aug 22, 2021
a49cf3d
Merge branch 'main' into bump_dask_min_reqs
Illviljan Aug 23, 2021
7ee9754
Merge branch 'main' into bump_dask_min_reqs
Illviljan Aug 24, 2021
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
4 changes: 2 additions & 2 deletions ci/requirements/py37-min-all-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies:
- cfgrib=0.9
- cftime=1.1
- coveralls
- dask=2.15
- distributed=2.15
- dask=2.24
- distributed=2.24
- h5netcdf=0.8
- h5py=2.10
- hdf5=1.10
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements/py37-min-nep18.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dependencies:
# require drastically newer packages than everything else
- python=3.7
- coveralls
- dask=2.9
- distributed=2.9
- dask=2.24
- distributed=2.24
- numpy=1.17
- pandas=0.25
- pint=0.15
Expand Down
8 changes: 8 additions & 0 deletions doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ New Features

Breaking changes
~~~~~~~~~~~~~~~~
- The minimum versions of some dependencies were changed:

============ ====== ====
Package Old New
============ ====== ====
dask 2.15 2.24
distributed 2.15 2.24
============ ====== ====

- The ``__repr__`` of a :py:class:`xarray.Dataset`'s ``coords`` and ``data_vars``
ignore ``xarray.set_option(display_max_rows=...)`` and show the full output
Expand Down
8 changes: 1 addition & 7 deletions xarray/core/computation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from .alignment import align, deep_align
from .merge import merge_attrs, merge_coordinates_without_align
from .options import OPTIONS, _get_keep_attrs
from .pycompat import dask_version, is_duck_dask_array
from .pycompat import is_duck_dask_array
from .utils import is_dict_like
from .variable import Variable

Expand Down Expand Up @@ -715,12 +715,6 @@ def func(*arrays):
**dask_gufunc_kwargs,
)

# todo: covers for https://github.com/dask/dask/pull/6207
# remove when minimal dask version >= 2.17.0
if dask_version < "2.17.0":
if signature.num_outputs > 1:
res = tuple(res)

return res

elif dask == "allowed":
Expand Down