Drop support for (optional dep) pyproj<3.3.0 #717

Author: soxofaan

pyproject.toml

@@ -52,7 +52,7 @@ dev = [
     "netCDF4>=1.7.0",
     "pyarrow>=10.0.1",
     "pydata_sphinx_theme",
-    "pyproj>=3.2.0",  # Pyproj is an optional, best-effort runtime dependency
+    "pyproj>=3.3.0",  # Pyproj is an optional, best-effort runtime dependency
     "pystac-client>=0.7.5",
     "pytest>=4.5.0",
     "python-dateutil>=2.7.0",

tests/rest/datacube/test_datacube100.py

@@ -193,17 +193,6 @@
 }
 
 
-def _get_normalizable_crs_inputs():
-    """
-    Dynamic (proj version based) generation of supported CRS inputs (to normalize).
-    :return:
-    """
-    yield "EPSG:32631"
-    yield 32631
-    yield "32631"
-    yield "+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs"  # is also EPSG:32631, in proj format
-    yield WKT2_FOR_EPSG23631
-
 
 def _get_leaf_node(cube: DataCube) -> dict:
     """Get leaf node (node with result=True), supporting old and new style of graph building."""
@@ -561,7 +550,18 @@ def test_aggregate_spatial_types(con100: Connection, polygon, expected_geometrie
     }
 
 
-@pytest.mark.parametrize("crs", _get_normalizable_crs_inputs())
+@pytest.mark.parametrize(
+    "crs",
+    [
+        "EPSG:32631",
+        32631,
+        "32631",
+        "+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs",  # is also EPSG:32631, in proj format
+        WKT2_FOR_EPSG23631,
+        PROJJSON_FOR_EPSG23631,
+        json.dumps(PROJJSON_FOR_EPSG23631),
+    ],
+)
 def test_aggregate_spatial_with_crs(con100: Connection, recwarn, crs: str):
     img = con100.load_collection("S2")
     polygon = shapely.geometry.box(0, 0, 1, 1)
@@ -588,36 +588,6 @@ def test_aggregate_spatial_with_crs(con100: Connection, recwarn, crs: str):
     }
 
 
-@pytest.mark.skipif(
-    pyproj.__version__ < ComparableVersion("3.3.0"),  # TODO #717
-    reason="PROJJSON format support requires pyproj 3.3.0 or higher",
-)
-@pytest.mark.parametrize("crs", [PROJJSON_FOR_EPSG23631, json.dumps(PROJJSON_FOR_EPSG23631)])
-def test_aggregate_spatial_with_crs_as_projjson(con100: Connection, recwarn, crs):
-    """Separate test coverage for PROJJSON, so we can skip it for Python versions below 3.8"""  # TODO #717
-    img = con100.load_collection("S2")
-    polygon = shapely.geometry.box(0, 0, 1, 1)
-    masked = img.aggregate_spatial(geometries=polygon, reducer="mean", crs=crs)
-    warnings = [str(w.message) for w in recwarn]
-    assert f"Geometry with non-Lon-Lat CRS {crs!r} is only supported by specific back-ends." in warnings
-    assert sorted(masked.flat_graph().keys()) == ["aggregatespatial1", "loadcollection1"]
-    assert masked.flat_graph()["aggregatespatial1"] == {
-        "process_id": "aggregate_spatial",
-        "arguments": {
-            "data": {"from_node": "loadcollection1"},
-            "geometries": {
-                "type": "Polygon",
-                "coordinates": (((1.0, 0.0), (1.0, 1.0), (0.0, 1.0), (0.0, 0.0), (1.0, 0.0)),),
-                "crs": {"properties": {"name": "EPSG:32631"}, "type": "name"},
-            },
-            "reducer": {
-                "process_graph": {
-                    "mean1": {"process_id": "mean", "arguments": {"data": {"from_parameter": "data"}}, "result": True}
-                }
-            },
-        },
-        "result": True,
-    }
 
 
 @pytest.mark.parametrize(
@@ -906,7 +876,18 @@ def test_mask_polygon_types(con100: Connection, polygon, expected_mask):
     }
 
 
-@pytest.mark.parametrize("crs", _get_normalizable_crs_inputs())
+@pytest.mark.parametrize(
+    "crs",
+    [
+        "EPSG:32631",
+        32631,
+        "32631",
+        "+proj=utm +zone=31 +datum=WGS84 +units=m +no_defs",  # is also EPSG:32631, in proj format
+        WKT2_FOR_EPSG23631,
+        PROJJSON_FOR_EPSG23631,
+        json.dumps(PROJJSON_FOR_EPSG23631),
+    ],
+)
 def test_mask_polygon_with_crs(con100: Connection, recwarn, crs: str):
     img = con100.load_collection("S2")
     polygon = shapely.geometry.box(0, 0, 1, 1)
@@ -929,33 +910,6 @@ def test_mask_polygon_with_crs(con100: Connection, recwarn, crs: str):
     }
 
 
-@pytest.mark.skipif(
-    pyproj.__version__ < ComparableVersion("3.3.0"),  # TODO #717
-    reason="PROJJSON format support requires pyproj 3.3.0 or higher",
-)
-@pytest.mark.parametrize("crs", [PROJJSON_FOR_EPSG23631, json.dumps(PROJJSON_FOR_EPSG23631)])
-def test_mask_polygon_with_crs_as_projjson(con100: Connection, recwarn, crs):
-    """Separate test coverage for PROJJSON, so we can skip it for Python versions below 3.8"""  # TODO #717
-    img = con100.load_collection("S2")
-    polygon = shapely.geometry.box(0, 0, 1, 1)
-    masked = img.mask_polygon(mask=polygon, srs=crs)
-    warnings = [str(w.message) for w in recwarn]
-    assert f"Geometry with non-Lon-Lat CRS {crs!r} is only supported by specific back-ends." in warnings
-    assert sorted(masked.flat_graph().keys()) == ["loadcollection1", "maskpolygon1"]
-    assert masked.flat_graph()["maskpolygon1"] == {
-        "process_id": "mask_polygon",
-        "arguments": {
-            "data": {"from_node": "loadcollection1"},
-            "mask": {
-                "type": "Polygon",
-                "coordinates": (((1.0, 0.0), (1.0, 1.0), (0.0, 1.0), (0.0, 0.0), (1.0, 0.0)),),
-                # All listed test inputs for crs should be converted to "EPSG:32631"
-                "crs": {"type": "name", "properties": {"name": "EPSG:32631"}},
-            },
-        },
-        "result": True,
-    }
-
 
 def test_mask_polygon_parameter(con100: Connection):
     img = con100.load_collection("S2")