Skip to content

Commit 7be9b73

Browse files
Merge pull request #3185 from dkillick/unpin_dask
[TST] Unpin dask
2 parents a41db2d + 25c5f4d commit 7be9b73

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/iris/cube.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3247,10 +3247,10 @@ def collapsed(self, coords, aggregator, **kwargs):
32473247
# on the cube lazy array.
32483248
# NOTE: do not reform the data in this case, as 'lazy_aggregate'
32493249
# accepts multiple axes (unlike 'aggregate').
3250-
collapse_axis = dims_to_collapse
3250+
collapse_axis = list(dims_to_collapse)
32513251
try:
32523252
data_result = aggregator.lazy_aggregate(self.lazy_data(),
3253-
collapse_axis,
3253+
axis=collapse_axis,
32543254
**kwargs)
32553255
except TypeError:
32563256
# TypeError - when unexpected keywords passed through (such as

requirements/core.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cartopy
77
#conda: proj4<5
88
cf_units>=2
99
cftime
10-
dask[array]==0.18.1 #conda: dask==0.18.1
10+
dask[array] #conda: dask
1111
matplotlib>=2,<3
1212
netcdf4
1313
numpy>=1.14

0 commit comments

Comments
 (0)