Update CI and solve some deprecation warnings

.github/workflows/run-tests.yml

@@ -15,17 +15,15 @@ jobs:
       fail-fast: false
       matrix:
         test-env:
-          - py38-all
-          - py38-xarray-dev
-          - py38-all-rc
-          - py39-all
           - py310-all
+          - py311-all
+          - py312-all
         use-mpl:
           - "--mpl"
         include:
-          - test-env: py38-min
+          - test-env: py311-min
             use-mpl: ""
-          - test-env: py38-xr
+          - test-env: py311-xr
             use-mpl: ""
     runs-on: ubuntu-latest
     defaults:

ci/requirements-py37-all.yml → ci/requirements-py311-all.yml

@@ -2,7 +2,7 @@ name: test_env
 channels:
   - conda-forge
 dependencies:
-  - python=3.7
+  - python=3.11
   - six
   - numpy
   - scipy

ci/requirements-py38-min.yml → ci/requirements-py311-min.yml

@@ -2,7 +2,7 @@ name: test_env
 channels:
   - conda-forge
 dependencies:
-  - python=3.8
+  - python=3.11
   - six
   - numpy
   - scipy

ci/requirements-py38-xr.yml → ci/requirements-py311-xr.yml

@@ -2,7 +2,7 @@ name: test_env
 channels:
   - conda-forge
 dependencies:
-  - python=3.8
+  - python=3.11
   - six
   - numpy
   - scipy

ci/requirements-py39-all.yml → ci/requirements-py312-all.yml

@@ -2,7 +2,7 @@ name: test_env
 channels:
   - conda-forge
 dependencies:
-  - python=3.9
+  - python=3.12
   - six
   - numpy
   - scipy

salem/gis.py

@@ -32,6 +32,7 @@ class Dummy():
         pass
     crs_type = Dummy
 
+
 def check_crs(crs, raise_on_error=False):
     """Checks if the crs represents a valid grid, projection or ESPG string.
 
@@ -1123,7 +1124,7 @@ def region_of_interest(self, shape=None, geometry=None, grid=None,
             x0, y0 = cgrid.transform(*xy0, crs=crs, nearest=True)
             x1, y1 = cgrid.transform(*xy1, crs=crs, nearest=True)
             mask[np.min([y0, y1]):np.max([y0, y1]) + 1,
-            np.min([x0, x1]):np.max([x0, x1]) + 1] = 1
+                 np.min([x0, x1]):np.max([x0, x1]) + 1] = 1
 
         return mask
 
@@ -1138,7 +1139,6 @@ def to_dict(self):
         --------
         from_dict : create a Grid from a dict
         """
-        srs = self.proj.srs
         return dict(proj=self.proj.srs, x0y0=(self.x0, self.y0),
                     nxny=(self.nx, self.ny), dxdy=(self.dx, self.dy),
                     pixel_ref=self.pixel_ref)
@@ -1242,8 +1242,7 @@ def to_geometry(self, to_crs=None):
                 ii.append(i)
         out['j'] = jj
         out['i'] = ii
-        out['geometry'] = geoms
-        out.crs = self.proj.srs
+        out.set_geometry(geoms, crs=self.proj.srs, inplace=True)
 
         if check_crs(to_crs):
             transform_geopandas(out, to_crs=to_crs, inplace=True)
@@ -1264,6 +1263,7 @@ def proj_is_same(p1, p2):
     """
     if has_gdal:
         # this is more robust, but gdal is a pain
+        osr.UseExceptions()
         s1 = osr.SpatialReference()
         s1.ImportFromProj4(p1.srs)
         s2 = osr.SpatialReference()
@@ -1577,7 +1577,7 @@ def mercator_grid(center_ll=None, extent=None, ny=600, nx=None,
 
     e, n = transform_proj(wgs84, projloc, lon, lat)
 
-    if origin== 'upper-left':
+    if origin == 'upper-left':
         corner = (-xx / 2. + e, yy / 2. + n)
         dxdy = (xx / nx, - yy / ny)
     else:

salem/sio.py

@@ -231,15 +231,15 @@ def _wrf_grid_from_dataset(ds):
 
         atol = 5e-3 if proj_id == 2 else 1e-3
         check = np.isclose(reflon, mylon, atol=atol)
-        if not np.alltrue(check):
+        if not np.all(check):
             n_pix = np.sum(~check)
             maxe = np.max(np.abs(reflon - mylon))
             if maxe < (360 - atol):
                 warnings.warn('For {} grid points, the expected accuracy ({}) '
                               'of our lons did not match those of the WRF '
                               'file. Max error: {}'.format(n_pix, atol, maxe))
         check = np.isclose(reflat, mylat, atol=atol)
-        if not np.alltrue(check):
+        if not np.all(check):
             n_pix = np.sum(~check)
             maxe = np.max(np.abs(reflat - mylat))
             warnings.warn('For {} grid points, the expected accuracy ({}) '

salem/tests/test_datasets.py

@@ -220,7 +220,6 @@ def test_xarray(self):
 class TestGeoNetcdf(unittest.TestCase):
 
     def test_eraint(self):
-
         f = get_demo_file('era_interim_tibet.nc')
         d = GeoNetcdf(f)
         assert d.grid.origin == 'upper-left'

salem/tests/test_gis.py

@@ -114,7 +114,7 @@ def test_constructor(self):
                                        g.corner_grid.xy_coordinates)
 
             ex = g.corner_grid.extent
-            assert_allclose([-0.5,  2.5, -0.5,  2.5], ex)
+            assert_allclose([-0.5, 2.5, -0.5, 2.5], ex)
             assert_allclose(g.center_grid.extent,
                                        g.corner_grid.extent)
 
@@ -157,7 +157,7 @@ def test_constructor(self):
                                        g.corner_grid.xy_coordinates)
 
             ex = g.corner_grid.extent
-            assert_allclose([-0.5,  2.5, -2.5,  0.5], ex)
+            assert_allclose([-0.5, 2.5, -2.5, 0.5], ex)
             assert_allclose(g.center_grid.extent,
                                        g.corner_grid.extent)
 
@@ -180,7 +180,6 @@ def test_constructor(self):
 
     def test_comparisons(self):
         """See if the grids can compare themselves"""
-
         args = dict(nxny=(3, 3), dxdy=(1, 1), x0y0=(0, 0), proj=wgs84)
         g1 = Grid(**args)
         self.assertEqual(g1.center_grid, g1.corner_grid)

salem/tests/test_graphics.py

@@ -63,9 +63,8 @@ def _create_dummy_shp(fname):
     p4 = shpg.Point(1, 1)
     df = gpd.GeoDataFrame()
     df['name'] = ['Polygon', 'Line']
-    df['geometry'] = gpd.GeoSeries([p1, p2])
+    df.set_geometry(gpd.GeoSeries([p1, p2]), crs='epsg:4326', inplace=True)
     of = os.path.join(testdir, fname)
-    df.crs = 'epsg:4326'
     df.to_file(of)
     return of
 

salem/tests/test_misc.py

@@ -59,7 +59,7 @@ def create_dummy_shp(fname):
     p4 = shpg.Point(1, 1)
     df = gpd.GeoDataFrame()
     df['name'] = ['Polygon', 'Line']
-    df['geometry'] = gpd.GeoSeries([p1, p2])
+    df.set_geometry(gpd.GeoSeries([p1, p2]), inplace=True)
     of = os.path.join(testdir, fname)
     df.to_file(of)
     return of