Make MEAN with weights lazy (#3299)

Make MEAN with weights lazy
SciTools · Sep 27, 2019 · ccd2058 · ccd2058
1 parent b103f0b
commit ccd2058
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/iris/analysis/__init__.py b/lib/iris/analysis/__init__.py
@@ -1490,7 +1490,7 @@ def interp_order(length):
 
 
 MEAN = WeightedAggregator('mean', ma.average,
-                          lazy_func=_build_dask_mdtol_function(da.mean))
+                          lazy_func=_build_dask_mdtol_function(da.ma.average))
 """
 An :class:`~iris.analysis.Aggregator` instance that calculates
 the mean over a :class:`~iris.cube.Cube`, as computed by
@@ -1530,7 +1530,7 @@ def interp_order(length):
 
 .. note::
 
-    Lazy operation is supported, via :func:`dask.array.nanmean`.
+    Lazy operation is supported, via :func:`dask.array.ma.average`.
 
 This aggregator handles masked data.
 

diff --git a/requirements/core.txt b/requirements/core.txt
@@ -7,7 +7,7 @@ cartopy
 #conda: proj4<6
 cf-units>=2
 cftime
-dask[array]  #conda: dask
+dask[array]>=1.1.0  #conda: dask>=1.1.0
 matplotlib>=2,<3
 netcdf4
 numpy>=1.14