Update test matrix for new MPL (#154)

* Update test matrix for new MPL

* Fix mpl

* Update base and pin mpl

* warnings

.gitignore

@@ -16,7 +16,7 @@ examples/*checkpoints
 # Tests stuffs
 salem/tests/result_images
 result_images
-sandbox.py
+sandbox*.py
 
 # Packages
 *.egg

.travis.yml

@@ -20,6 +20,7 @@ matrix:
   - env: CONDA_ENV=py36-xr MPL=
   - env: CONDA_ENV=py36-xarray-dev MPL=--mpl
   - env: CONDA_ENV=py36-all-rc MPL=--mpl
+  - env: CONDA_ENV=py37-all MPL=--mpl
   allow_failures:
   - env: CONDA_ENV=py27-all MPL=--mpl
   - env: CONDA_ENV=py36-xr MPL=

ci/requirements-py27-all.yml

@@ -20,6 +20,7 @@ dependencies:
   - scikit-image
   - descartes
   - cartopy
+  - pip
   - pip:
     - coveralls
     - pytest-cov

ci/requirements-py36-all-rc.yml

@@ -21,6 +21,7 @@ dependencies:
   - scikit-image
   - descartes
   - cartopy
+  - pip
   - pip:
     - coveralls
     - pytest-cov

ci/requirements-py36-all-xr10.yml

@@ -15,11 +15,12 @@ dependencies:
   - pandas
   - xarray=0.10.9
   - dask
-  - matplotlib<3.0.0
+  - matplotlib=3.0.3
   - scikit-image
   - Pillow
   - descartes
   - cartopy
+  - pip
   - pip:
     - coveralls
     - pytest-cov

ci/requirements-py36-all.yml

@@ -15,11 +15,12 @@ dependencies:
   - pandas
   - xarray
   - dask
-  - matplotlib<3.0.0
+  - matplotlib=3.0.3
   - scikit-image
   - Pillow
   - descartes
   - cartopy
+  - pip
   - pip:
     - coveralls
     - pytest-cov

ci/requirements-py36-min.yml

@@ -11,6 +11,7 @@ dependencies:
   - netCDF4
   - pandas
   - xarray
+  - pip
   - pip:
     - coveralls
     - pytest-cov

ci/requirements-py36-xarray-dev.yml

@@ -19,6 +19,7 @@ dependencies:
   - scikit-image
   - descartes
   - cartopy
+  - pip
   - pip:
     - git+https://github.com/pydata/xarray.git
     - coveralls

ci/requirements-py36-xr.yml

@@ -12,6 +12,7 @@ dependencies:
   - pandas
   - xarray
   - dask
+  - pip
   - pip:
     - coveralls
     - pytest-cov

ci/requirements-py37-all.yml

@@ -0,0 +1,28 @@
+name: test_env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.7
+  - six
+  - numpy
+  - scipy
+  - pyproj
+  - joblib
+  - netCDF4
+  - shapely
+  - geopandas
+  - rasterio
+  - pandas
+  - xarray
+  - dask
+  - matplotlib=3.0.3
+  - scikit-image
+  - Pillow
+  - descartes
+  - cartopy
+  - pip
+  - pip:
+    - coveralls
+    - pytest-cov
+    - pytest-mpl
+    - motionless

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+markers =
+    mpl_image_compare: matplotlib image comparison

salem/__init__.py

@@ -46,7 +46,7 @@ def _lazy_property(self):
 if not path.exists(download_dir):
     makedirs(download_dir)
 
-sample_data_gh_commit = 'b6d201fd8c228d5a1a6ea97964ef769dfef186ec'
+sample_data_gh_commit = '877863f465cb3fdf9be8abd13c433f5f3a5828d6'
 sample_data_dir = path.join(cache_dir, 'salem-sample-data-' +
                             sample_data_gh_commit)
 

salem/sio.py

@@ -85,10 +85,10 @@ def _memory_shapefile_to_grid(shape_cpath, grid=None,
 
     shape = read_shapefile(shape_cpath, cached=True)
     e = grid.extent_in_crs(crs=shape.crs)
-    p = np.nonzero(~((shape['min_x'] > e[1]) |
-                     (shape['max_x'] < e[0]) |
-                     (shape['min_y'] > e[3]) |
-                     (shape['max_y'] < e[2])))
+    p = np.nonzero(~((shape['min_x'].to_numpy() > e[1]) |
+                     (shape['max_x'].to_numpy() < e[0]) |
+                     (shape['min_y'].to_numpy() > e[3]) |
+                     (shape['max_y'].to_numpy() < e[2])))
     shape = shape.iloc[p]
     shape = gis.transform_geopandas(shape, to_crs=grid, inplace=True)
     return shape
@@ -217,7 +217,8 @@ def _wrf_grid_from_dataset(ds):
             reflon = reflon[0, :, :]
             reflat = reflat[0, :, :]
         mylon, mylat = grid.ll_coordinates
-        atol = 1e-3
+
+        atol = 5e-3 if proj_id == 2 else 1e-3
         check = np.isclose(reflon, mylon, atol=atol)
         if not np.alltrue(check):
             n_pix = np.sum(~check)
@@ -1144,8 +1145,11 @@ def open_mf_wrf_dataset(paths, chunks=None,  compat='no_conflicts', lock=None,
 
     if preprocess is not None:
         datasets = [preprocess(ds) for ds in datasets]
-
-    combined = xr.auto_combine(datasets, concat_dim='time', compat=compat)
+    try:
+        combined = xr.combine_nested(datasets, concat_dim='time',
+                                     compat=compat)
+    except AttributeError:
+        combined = xr.auto_combine(datasets, concat_dim='time', compat=compat)
     combined._file_obj = _MultiFileCloser(file_objs)
     combined.attrs = datasets[0].attrs
 

salem/tests/test_graphics.py

@@ -1018,7 +1018,8 @@ def test_cartopy_polar():
 
     fig = plt.figure(figsize=(8, 8))
 
-    ods = open_wrf_dataset(get_demo_file('geo_em_d02_polarstereo.nc')).isel(time=0)
+    ods = open_wrf_dataset(get_demo_file('geo_em_d02_polarstereo.nc'))
+    ods = ods.isel(time=0)
 
     ax = plt.subplot(2, 2, 1)
     smap = ods.salem.get_map()
@@ -1044,5 +1045,4 @@ def test_cartopy_polar():
     ax.gridlines()
     ax.scatter(ds.XLONG_M, ds.XLAT_M, transform=cartopy.crs.PlateCarree(), s=5)
 
-    plt.tight_layout()
     return fig