pass dask compute/persist args through from load/compute/perist

ci/requirements-py27-cdat+pynio.yml

@@ -16,6 +16,7 @@ dependencies:
   - pathlib2
   - pynio
   - pytest
+  - mock
   - scipy
   - seaborn
   - toolz

ci/requirements-py27-min.yml

@@ -2,6 +2,7 @@ name: test_env
 dependencies:
   - python=2.7
   - pytest
+  - mock
   - numpy==1.11
   - pandas==0.18.0
   - pip:

ci/requirements-py27-windows.yml

@@ -11,6 +11,7 @@ dependencies:
   - netcdf4
   - pathlib2
   - pytest
+  - mock
   - numpy
   - pandas
   - scipy

ci/requirements-py34.yml

@@ -3,6 +3,7 @@ dependencies:
   - python=3.4
   - bottleneck
   - pytest
+  - mock
   - pandas
   - pip:
     - coveralls

ci/requirements-py35.yml

@@ -10,6 +10,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - mock
   - numpy
   - pandas
   - scipy

ci/requirements-py36-bottleneck-dev.yml

@@ -10,6 +10,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - mock
   - numpy
   - pandas
   - scipy

ci/requirements-py36-condaforge-rc.yml

@@ -11,6 +11,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - mock
   - numpy
   - pandas
   - seaborn

ci/requirements-py36-dask-dev.yml

@@ -8,6 +8,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - mock
   - numpy
   - pandas
   - seaborn

ci/requirements-py36-netcdf4-dev.yml

@@ -10,6 +10,7 @@ dependencies:
   - h5netcdf
   - matplotlib
   - pytest
+  - mock
   - numpy
   - pandas
   - scipy

ci/requirements-py36-pandas-dev.yml

@@ -11,6 +11,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - mock
   - numpy
   - scipy
   - toolz

ci/requirements-py36-windows.yml

@@ -10,6 +10,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - mock
   - numpy
   - pandas
   - scipy

ci/requirements-py36.yml

@@ -10,6 +10,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - pytest
+  - mock
   - numpy
   - pandas
   - scipy

doc/whats-new.rst

@@ -101,6 +101,10 @@ Enhancements
    methods. Any keyword arguments supplied to these methods are passed on to
    the corresponding dask function (:issue:`1523`).
    By `Joe Hamman <https://github.com/jhamman>`_.
+- Encoding attributes are now preserved when xarray objects are concatenated.
+  The encoding is copied from the first object  (:issue:`1297`).
+  By `Joe Hamman <https://github.com/jhamman>`_ and
+  `Gerrit Holl <https://github.com/gerritholl`_.
 
 Bug fixes
 ~~~~~~~~~

xarray/tests/test_dask.py

@@ -4,6 +4,8 @@
 import pickle
 import numpy as np
 import pandas as pd
+import pytest
+import mock
 
 import xarray as xr
 from xarray import Variable, DataArray, Dataset
@@ -183,22 +185,6 @@ def test_bivariate_ufunc(self):
         self.assertLazyAndAllClose(np.maximum(u, 0), xu.maximum(v, 0))
         self.assertLazyAndAllClose(np.maximum(u, 0), xu.maximum(0, v))
 
-    def test_compute_args(self):
-        a = Variable('x', [1, 2]).chunk()
-        expected = Variable('x', [1, 4])
-        b = a * a
-        # compute
-        b1 = b.compute(get=dask.multiprocessing.get)
-        assert b1._in_memory
-        assert_equal(b1, expected)
-        b2 = b.compute(get=dask.multiprocessing.get, num_workers=4)
-        assert b2._in_memory
-        assert_equal(b2, expected)
-        # load
-        b3 = b.load(get=dask.multiprocessing.get, num_workers=4)
-        assert b3._in_memory
-        assert_equal(b3, expected)
-
 
 @requires_dask
 class TestDataArrayAndDataset(DaskTestCase):
@@ -410,31 +396,58 @@ def test_from_dask_variable(self):
                       coords={'x': range(4)}, name='foo')
         self.assertLazyAndIdentical(self.lazy_array, a)
 
-    def test_compute_args(self):
-        a = DataArray([1, 2], name='a').chunk()
-        expected = DataArray([1, 4], name='expected')
-        b = a * a
-        # compute
-        b1 = b.compute(get=dask.multiprocessing.get)
-        assert b1._in_memory
-        assert_equal(b1, expected)
-        b2 = b.compute(get=dask.multiprocessing.get, num_workers=4)
-        assert b2._in_memory
-        assert_equal(b2, expected)
-        # load
-        b3 = b.load(get=dask.multiprocessing.get, num_workers=4)
-        assert b3._in_memory
-        assert_equal(b3, expected)
-        # persist
-        b4 = b.persist(get=dask.multiprocessing.get, num_workers=4)
-        assert b4._in_memory
-        assert_equal(b4, expected)
-
-        # dataset
-        ds = a.to_dataset()
-        ds.compute(get=dask.multiprocessing.get, num_workers=4)
-        ds.load(get=dask.multiprocessing.get, num_workers=4)
-        ds.persist(get=dask.multiprocessing.get, num_workers=4)
+
+@pytest.mark.parametrize("method", ['load', 'compute'])
+def test_dask_kwargs_variable(method):
+    x = Variable('y', da.from_array(np.arange(3), chunks=(2,)))
+    with mock.patch.object(Variable, method,
+                           return_value=np.arange(3)) as mock_method:
+        getattr(x, method)(foo='bar')
+    mock_method.assert_called_with(foo='bar')
+
+    # args should be passed on to da.Array.compute()
+    with mock.patch.object(da.Array, 'compute',
+                           return_value=np.arange(3)) as mock_compute:
+        getattr(x, method)(foo='bar')
+    mock_compute.assert_called_with(foo='bar')
+
+
+@pytest.mark.parametrize("method", ['load', 'compute', 'persist'])
+def test_dask_kwargs_dataarray(method):
+    data = da.from_array(np.arange(3), chunks=(2,))
+    x = DataArray(data)
+    with mock.patch.object(DataArray, method,
+                           return_value=np.arange(3)) as mock_method:
+        getattr(x, method)(foo='bar')
+    mock_method.assert_called_with(foo='bar')
+
+    if method in ['load', 'compute']:
+        dask_func = 'dask.array.compute'
+    else:
+        dask_func = 'dask.persist'
+    # args should be passed on to "dask_func"
+    with mock.patch(dask_func) as mock_func:
+        getattr(x, method)(foo='bar')
+    mock_func.assert_called_with(data, foo='bar')
+
+
+@pytest.mark.parametrize("method", ['load', 'compute', 'persist'])
+def test_dask_kwargs_dataset(method):
+    data = da.from_array(np.arange(3), chunks=(2,))
+    x = Dataset({'x': (('y'), data)})
+    with mock.patch.object(Dataset, method,
+                           return_value=np.arange(3)) as mock_method:
+        getattr(x, method)(foo='bar')
+    mock_method.assert_called_with(foo='bar')
+
+    if method in ['load', 'compute']:
+        dask_func = 'dask.array.compute'
+    else:
+        dask_func = 'dask.persist'
+    # args should be passed on to "dask_func"
+    with mock.patch(dask_func) as mock_func:
+        getattr(x, method)(foo='bar')
+    mock_func.assert_called_with(data, foo='bar')
 
 
 kernel_call_count = 0