Various updates and fixes (#223)

* Various updates and fixes

* More

.github/workflows/run-tests.yml

@@ -15,11 +15,11 @@ jobs:
       fail-fast: false
       matrix:
         test-env:
-          - py37-all
           - py38-all
           - py38-xarray-dev
           - py38-all-rc
           - py39-all
+          - py310-all
         use-mpl:
           - "--mpl"
         include:

.gitignore

@@ -37,3 +37,4 @@ docs/.doctrees
 docs/auto_examples
 docs/modules
 salem/version.py
+.pytest_cache

ci/requirements-py310-all.yml

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

salem/__init__.py

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

salem/gis.py

@@ -9,7 +9,7 @@
 import copy
 import warnings
 from functools import partial
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 # External libs
 import pyproj
@@ -1509,7 +1509,7 @@ def proj_to_cartopy(proj):
     if cl.__name__ == 'Mercator':
         kw_proj.pop('false_easting', None)
         kw_proj.pop('false_northing', None)
-        if LooseVersion(cartopy.__version__) < LooseVersion('0.15'):
+        if Version(cartopy.__version__) < Version('0.15'):
             kw_proj.pop('latitude_true_scale', None)
     elif cl.__name__ == 'Stereographic':
         kw_proj.pop('scale_factor', None)

salem/graphics.py

@@ -507,9 +507,13 @@ def _check_data(self, data=None, crs=None, interp='nearest',
                 with warnings.catch_warnings():
                     mess = "invalid value encountered in reduce"
                     warnings.filterwarnings("ignore", message=mess)
+                    mess = "All-NaN slice encountered"
+                    warnings.filterwarnings("ignore", message=mess)
                     mess = ("Possible precision loss when converting from "
                             "int64 to float64")
                     warnings.filterwarnings("ignore", message=mess)
+                    mess = "Passing `np.nan` to mean no clipping in np.clip"
+                    warnings.filterwarnings("ignore", message=mess)
                     try:
                         data = imresize(data.filled(np.NaN),
                                         (self.grid.ny, self.grid.nx),

salem/sio.py

@@ -515,10 +515,10 @@ def roi(self, ds=None, **kwargs):
             kwargs.setdefault('grid', grid)
 
         mask = self.grid.region_of_interest(**kwargs)
-        coords = {self.y_dim: self._obj[self.y_dim].values,
-                  self.x_dim: self._obj[self.x_dim].values}
-        mask = xr.DataArray(mask, coords=coords,
-                            dims=(self.y_dim, self.x_dim)) 
+        # coords = {self.y_dim: self._obj[self.y_dim].values,
+        #           self.x_dim: self._obj[self.x_dim].values}
+        # mask = xr.DataArray(mask, coords=coords,
+        #                     dims=(self.y_dim, self.x_dim))
 
         out = self._obj.where(mask, other=other)
 

salem/tests/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import division
 import unittest
-from distutils.version import LooseVersion
+from packaging.version import Version
 import os
 from salem import python_version
 from six.moves.urllib.request import urlopen
@@ -40,11 +40,11 @@ def has_internet():
 
 try:
     import matplotlib
-    mpl_version = LooseVersion(matplotlib.__version__)
-    has_matplotlib = mpl_version >= LooseVersion('2')
+    mpl_version = Version(matplotlib.__version__)
+    has_matplotlib = mpl_version >= Version('2')
 except ImportError:
     has_matplotlib = False
-    mpl_version = LooseVersion('0.0.0')
+    mpl_version = Version('0.0.0')
 
 try:
     import rasterio

salem/tests/test_graphics.py

@@ -1,5 +1,5 @@
 from __future__ import division
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 import warnings
 import os
@@ -24,9 +24,9 @@
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
 import geopandas as gpd
-MPL_VERSION = LooseVersion(mpl.__version__)
-ftver = LooseVersion(mpl.ft2font.__freetype_version__)
-if ftver >= LooseVersion('2.8.0'):
+MPL_VERSION = Version(mpl.__version__)
+ftver = Version(mpl.ft2font.__freetype_version__)
+if ftver >= Version('2.8.0'):
     freetype_subdir = 'freetype_28'
 else:
     freetype_subdir = 'freetype_old'
@@ -893,6 +893,7 @@ def test_plot_on_map():
 @requires_matplotlib
 @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir)
 def test_example_docs():
+
     import salem
     from salem.utils import get_demo_file
     ds = salem.open_xr_dataset(get_demo_file('wrfout_d01.nc'))