Skip to content

Commit 4fd81b5

Browse files
authored
Bump minimum version requirements for dask from 2.15 to 2.24 (#5726)
* Bump min requirements for dask * Update whats-new.rst
1 parent a6b44d7 commit 4fd81b5

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

ci/requirements/py37-min-all-deps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dependencies:
1515
- cfgrib=0.9
1616
- cftime=1.1
1717
- coveralls
18-
- dask=2.15
19-
- distributed=2.15
18+
- dask=2.24
19+
- distributed=2.24
2020
- h5netcdf=0.8
2121
- h5py=2.10
2222
- hdf5=1.10

ci/requirements/py37-min-nep18.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ dependencies:
77
# require drastically newer packages than everything else
88
- python=3.7
99
- coveralls
10-
- dask=2.9
11-
- distributed=2.9
10+
- dask=2.24
11+
- distributed=2.24
1212
- numpy=1.17
1313
- pandas=0.25
1414
- pint=0.15

doc/whats-new.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ New Features
3535

3636
Breaking changes
3737
~~~~~~~~~~~~~~~~
38+
- The minimum versions of some dependencies were changed:
39+
40+
============ ====== ====
41+
Package Old New
42+
============ ====== ====
43+
dask 2.15 2.24
44+
distributed 2.15 2.24
45+
============ ====== ====
3846

3947
- The ``__repr__`` of a :py:class:`xarray.Dataset`'s ``coords`` and ``data_vars``
4048
ignore ``xarray.set_option(display_max_rows=...)`` and show the full output

xarray/core/computation.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from .alignment import align, deep_align
3131
from .merge import merge_attrs, merge_coordinates_without_align
3232
from .options import OPTIONS, _get_keep_attrs
33-
from .pycompat import dask_version, is_duck_dask_array
33+
from .pycompat import is_duck_dask_array
3434
from .utils import is_dict_like
3535
from .variable import Variable
3636

@@ -715,12 +715,6 @@ def func(*arrays):
715715
**dask_gufunc_kwargs,
716716
)
717717

718-
# todo: covers for https://github.com/dask/dask/pull/6207
719-
# remove when minimal dask version >= 2.17.0
720-
if dask_version < "2.17.0":
721-
if signature.num_outputs > 1:
722-
res = tuple(res)
723-
724718
return res
725719

726720
elif dask == "allowed":

0 commit comments

Comments
 (0)