Fixed compatibility issues with xarray 0.10

Chilipp · Chilipp · commit 81b8b54705ac · 2017-11-22T09:57:12.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,10 @@ language: generic
 matrix:
   include:
   # linux environments
+  - env:
+      - PYTHON_VERSION=3.6
+      - XARRAY_VERSION=0.10
+    os: linux
   - env:
       - PYTHON_VERSION=3.6
       - XARRAY_VERSION=0.9
@@ -18,6 +22,10 @@ matrix:
       - PYTHON_VERSION=3.5
       - XARRAY_VERSION=0.8
     os: linux
+  - env:
+      - PYTHON_VERSION=2.7
+      - XARRAY_VERSION=0.10
+    os: linux
   - env:
       - PYTHON_VERSION=2.7
       - XARRAY_VERSION=0.9
@@ -27,13 +35,17 @@ matrix:
       - XARRAY_VERSION=0.8
     os: linux
   # osx environments
+  - env:
+      - PYTHON_VERSION=3.6
+      - XARRAY_VERSION=0.10
+    os: osx
   - env:
       - PYTHON_VERSION=3.6
       - XARRAY_VERSION=0.9
     os: osx
   - env:
       - PYTHON_VERSION=2.7
-      - XARRAY_VERSION=0.9
+      - XARRAY_VERSION=0.10
     os: osx
 addons:  # install cdo
   apt:
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,6 +12,8 @@ environment:
       XARRAY_VERSION: "0.8"
     - PYTHON_VERSION: "3.6"
       XARRAY_VERSION: "0.9"
+    - PYTHON_VERSION: "3.6"
+      XARRAY_VERSION: "0.10"
 install:
   # Install miniconda Python
   - "powershell ./ci/install_python.ps1"
diff --git a/psyplot/data.py b/psyplot/data.py
@@ -91,6 +91,13 @@ def _get_dims(arr):
     return tuple(filter(lambda d: d != VARIABLELABEL, arr.dims))
 
 
+def _open_store(store_mod, store_cls, fname):
+    try:
+        return getattr(import_module(store_mod), store_cls).open(fname)
+    except AttributeError:
+        return getattr(import_module(store_mod), store_cls)(fname)
+
+
 @docstrings.get_sectionsf('setup_coords')
 @dedent
 def setup_coords(arr_names=None, sort=[], dims={}, **kwargs):
@@ -4066,13 +4073,13 @@ def _open_ds_from_store(fname, store_mod=None, store_cls=None, **kwargs):
                     store_mod = repeat(store_mod)
                 if isstring(store_cls):
                     store_cls = repeat(store_cls)
-                fname = [getattr(import_module(sm), sc)(f)
+                fname = [_open_store(sm, sc, f)
                          for sm, sc, f in zip(store_mod, store_cls, fname)]
                 kwargs['engine'] = None
                 kwargs['lock'] = False
                 return open_mfdataset(fname, **kwargs)
     if store_mod is not None and store_cls is not None:
-        fname = getattr(import_module(store_mod), store_cls)(fname)
+        fname = _open_store(store_mod, store_cls, fname)
     return open_dataset(fname, **kwargs)
 
 
diff --git a/tests/envs/environment_py3.6_xr0.10.yml b/tests/envs/environment_py3.6_xr0.10.yml
@@ -0,0 +1,14 @@
+name: psyplot_py3.6_xr0.10
+channels:
+    - conda-forge
+dependencies:
+    - python=3.6
+    - matplotlib
+    - dask
+    - xarray=0.10.*
+    - netCDF4
+    - seaborn
+    - scipy  # necessary for scipy engine test
+    - gdal  # for psyplot.gdal_store
+    - pip:
+        - pytest
diff --git a/tests/test_data.py b/tests/test_data.py
@@ -1185,7 +1185,10 @@ def _test_engine(self, engine):
         store_mod, store = ds.psy.data_store
         # try to load the dataset
         mod = import_module(store_mod)
-        ds2 = psyd.open_dataset(getattr(mod, store)(fname))
+        try:
+            ds2 = psyd.open_dataset(getattr(mod, store).open(fname))
+        except AttributeError:
+            ds2 = psyd.open_dataset(getattr(mod, store)(fname))
         ds.close()
         ds2.close()
         ds.psy.filename = None
