Test with GDAL 3 and Py38 (#57)

.travis.yml

@@ -9,7 +9,7 @@ matrix:
   - os: linux
     env: PYTHON_VERSION="3.7" MAINDEPS="numpy=1.16 scipy=1.3 pytz" DEPS="dask-core=1.* gdal=2.* toolz pandas=0.25 geopandas=0.6 pyproj>=2"
   - os: linux
-    env: PYTHON_VERSION="3.7" MAINDEPS="numpy scipy pytz" DEPS="dask-core gdal=2.* toolz geopandas pyproj>=2"
+    env: PYTHON_VERSION="3.8" MAINDEPS="" DEPS="numpy scipy pytz dask-core gdal toolz geopandas pyproj"
 
 install:
   - wget https://repo.anaconda.com/pkgs/misc/conda-execs/conda-latest-$TRAVIS_OS_NAME-64.exe -O conda.exe

CHANGES.rst

@@ -6,6 +6,8 @@ Changelog of dask-geomodeling
 
 - Fix point requests in raster.Smooth.
 
+- GDAL 3 compatibility fixes.
+
 
 2.2.9 (2020-06-23)
 ------------------

dask_geomodeling/raster/misc.py

@@ -377,7 +377,7 @@ def __init__(self, store, data, select=False):
         if not hasattr(data, "__iter__"):
             raise TypeError("'{}' object is not allowed".format(type(data)))
         try:
-            source, target = map(np.asarray, zip(*data))
+            source, target = self._data_as_ndarray(data)
         except ValueError:
             raise ValueError("Please supply a list of [from, to] values")
         # "from" can have bool or int dtype, "to" can also be float
@@ -398,6 +398,11 @@ def __init__(self, store, data, select=False):
             raise TypeError("'{}' object is not allowed".format(type(select)))
         super().__init__(store, data, select)
 
+    @staticmethod
+    def _data_as_ndarray(data):
+        source, target = zip(*data)
+        return np.asarray(source), np.asarray(target)
+
     @property
     def data(self):
         return self.args[1]
@@ -408,7 +413,7 @@ def select(self):
 
     @property
     def dtype(self):
-        _, target = map(np.asarray, zip(*self.data))
+        _, target = self._data_as_ndarray(self.data)
         return target.dtype
 
     @property
@@ -431,7 +436,7 @@ def process(store_data, process_kwargs):
 
         no_data_value = store_data["no_data_value"]
         values = store_data["values"]
-        source, target = map(np.asarray, zip(*process_kwargs["data"]))
+        source, target = Reclassify._data_as_ndarray(process_kwargs["data"])
         dtype = np.dtype(process_kwargs["dtype"])
         fillvalue = process_kwargs["fillvalue"]
 

dask_geomodeling/tests/test_utils.py

@@ -78,13 +78,17 @@ def test_get_epsg_or_wkt(self):
         self.assertEqual(out, "EPSG:3857")
         # no epsg
         wkt = """GEOGCS["GCS_WGS_1984",
-                     DATUM["D_WGS_1984",SPHEROID[
-                         "WGS_1984",6378137,298.257223563]],
-                     PRIMEM["Greenwich",0],
-                     UNIT["Degree",
-                         0.017453292519943295]]"""
+                        DATUM["D_WGS_1984",SPHEROID[
+                            "WGS_1984",6378137,298.257223563]],
+                        PRIMEM["Greenwich",0],
+                        UNIT["Degree",
+                            0.017453292519943295]]"""
         out = utils.get_epsg_or_wkt(wkt)
-        self.assertEqual(out, wkt.replace(" ", "").replace("\n", ""))
+        # do not test exact equality: different GDAL versions give different
+        # results
+        assert out.startswith("GEOGCS")
+        assert 'PRIMEM["Greenwich",0]' in out
+        assert 'UNIT["Degree"' in out
 
     def test_get_footprint(self):
         output = utils.get_footprint(size=5)

dask_geomodeling/utils.py

@@ -39,6 +39,8 @@
     from pyproj import CRS
 
 
+GDAL3 = gdal.VersionInfo().startswith("3")
+
 def get_index(values, no_data_value):
     """ Return an index to access for data values in values. """
     equal = np.isclose if values.dtype.kind == "f" else np.equal
@@ -354,7 +356,14 @@ def aligns_with(self, other):
 @lru_cache(32)  # least-recently-used cache of size 32
 def get_sr(user_input):
     """ Return osr.SpatialReference for user input. """
-    return osr.SpatialReference(osr.GetUserInputAsWKT(str(user_input)))
+    sr = osr.SpatialReference(osr.GetUserInputAsWKT(str(user_input)))
+    # https://github.com/OSGeo/gdal/blob/release/3.0/gdal/MIGRATION_GUIDE.TXT
+    # 
+    # GDAL takes into account official axis order.
+    # Traditional GIS-friendly axis order can be restored with:
+    if GDAL3:
+        sr.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    return sr
 
 
 def get_crs(user_input):