Skip to content

[TST] Unpin dask #3185

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

Merged
corinnebosley merged 2 commits into from
Oct 4, 2018
Merged

[TST] Unpin dask #3185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f2aadc
Unpin dask
DPeterK Oct 3, 2018
25c5f4d
Correct cube collapse code
DPeterK Oct 4, 2018
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 lib/iris/cube.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3241,10 +3241,10 @@ def collapsed(self, coords, aggregator, **kwargs):
# on the cube lazy array.
# NOTE: do not reform the data in this case, as 'lazy_aggregate'
# accepts multiple axes (unlike 'aggregate').
collapse_axis = dims_to_collapse
collapse_axis = list(dims_to_collapse)
try:
data_result = aggregator.lazy_aggregate(self.lazy_data(),
collapse_axis,
axis=collapse_axis,
**kwargs)
except TypeError:
# TypeError - when unexpected keywords passed through (such as
Expand Down
2 changes: 1 addition & 1 deletion requirements/core.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cartopy
#conda: proj4<5
cf_units>=2
cftime
dask[array]==0.18.1 #conda: dask==0.18.1
dask[array] #conda: dask
matplotlib>=2,<3
netcdf4
numpy>=1.14
Expand Down