DEP: Minimum PROJ version 9.2 (#1394)

Author: snowman2

.github/workflows/tests.yaml

@@ -41,16 +41,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.10', '3.11', '3.12']
-        proj-version: ['9.3.0']
+        proj-version: ['9.4.0']
         include:
           - python-version: '3.10'
-            proj-version: '9.2.1'
-          - python-version: '3.10'
-            proj-version: '9.1.1'
+            proj-version: '9.3.1'
           - python-version: '3.10'
-            proj-version: '9.1.0'
-          - python-version: '3.10'
-            proj-version: '9.0.1'
+            proj-version: '9.2.1'
     steps:
       - uses: actions/checkout@v4
 
@@ -134,10 +130,6 @@ jobs:
           #   python-version: '*'
           #   python-implementation: pypy
           #   proj-version: '*'
-          - os: ubuntu-latest
-            python-version: '*'
-            python-implementation: python
-            proj-version: '9.1.1'
     steps:
       - uses: actions/checkout@v4
 

docs/history.rst

@@ -5,6 +5,7 @@ Latest
 ------
 - WHL: Wheels contain PROJ 9.4.0 (pull #1386)
 - DEP: Minimum supported Python version 3.10 (pull #1357)
+- DEP: Minimum PROJ version 9.2 (pull #1394)
 - ENH: Add :meth:`CRS.is_deprecated` and :meth:`CRS.get_non_deprecated` (pull #1383)
 
 3.6.1

docs/installation.rst

@@ -76,6 +76,7 @@ pyproj         PROJ
 3.3            8.0-9.1
 3.4+           8.2+
 3.5+           9+
+3.7+           9.2+
 ============   ============
 
 Setup PROJ

pyproj/_crs.pyx

@@ -2342,10 +2342,9 @@ cdef dict _CRS_TYPE_MAP = {
     PJ_TYPE_ENGINEERING_CRS: "Engineering CRS",
     PJ_TYPE_BOUND_CRS: "Bound CRS",
     PJ_TYPE_OTHER_CRS: "Other CRS",
+    PJ_TYPE_DERIVED_PROJECTED_CRS: "Derived Projected CRS",
 }
 
-IF (CTE_PROJ_VERSION_MAJOR, CTE_PROJ_VERSION_MINOR) >= (9, 2):
-    _CRS_TYPE_MAP[PJ_TYPE_DERIVED_PROJECTED_CRS] = "Derived Projected CRS"
 
 cdef class _CRS(Base):
     """
@@ -2396,21 +2395,14 @@ cdef class _CRS(Base):
         if self._type_name is not None:
             return self._type_name
         self._type_name = _CRS_TYPE_MAP[self._type]
-        if not self.is_derived or self._type == PJ_TYPE_PROJECTED_CRS:
+        if not self.is_derived or self._type in (
+            PJ_TYPE_PROJECTED_CRS,
+            PJ_TYPE_DERIVED_PROJECTED_CRS,
+        ):
             # Projected CRS are derived by definition
             # https://github.com/OSGeo/PROJ/issues/3525#issuecomment-1365790999
             return self._type_name
 
-        # Handle Derived Projected CRS
-        # https://github.com/OSGeo/PROJ/issues/3525#issuecomment-1366002289
-        IF (CTE_PROJ_VERSION_MAJOR, CTE_PROJ_VERSION_MINOR) < (9, 2):
-            if self._type == PJ_TYPE_OTHER_CRS:
-                self._type_name = "Derived Projected CRS"
-                return self._type_name
-        ELSE:
-            if self._type == PJ_TYPE_DERIVED_PROJECTED_CRS:
-                return self._type_name
-
         self._type_name = f"Derived {self._type_name}"
         return self._type_name
 

pyproj/_transformer.pyx

@@ -35,10 +35,6 @@ proj_version_str = f"{PROJ_VERSION_MAJOR}.{PROJ_VERSION_MINOR}.{PROJ_VERSION_PAT
 PROJ_VERSION = (PROJ_VERSION_MAJOR, PROJ_VERSION_MINOR, PROJ_VERSION_PATCH)
 _AUTH_CODE_RE = re.compile(r"(?P<authority>\w+)\:(?P<code>\w+)")
 
-IF (CTE_PROJ_VERSION_MAJOR, CTE_PROJ_VERSION_MINOR) >= (9, 1):
-    cdef extern from "proj.h" nogil:
-        PJ* proj_trans_get_last_used_operation(PJ *P)
-
 
 cdef dict _TRANSFORMER_TYPE_MAP = {
     PJ_TYPE_UNKNOWN: "Unknown Transformer",
@@ -322,13 +318,10 @@ cdef PJ* proj_create_crs_to_crs(
         options[options_index] = b"FORCE_OVER=YES"
         options_index += 1
     if only_best is not None:
-        IF (CTE_PROJ_VERSION_MAJOR, CTE_PROJ_VERSION_MINOR) >= (9, 2):
-            if only_best:
-                options[options_index] = b"ONLY_BEST=YES"
-            else:
-                options[options_index] = b"ONLY_BEST=NO"
-        ELSE:
-            raise NotImplementedError("only_best requires PROJ 9.2+.")
+        if only_best:
+            options[options_index] = b"ONLY_BEST=YES"
+        else:
+            options[options_index] = b"ONLY_BEST=NO"
 
     cdef PJ* transform = NULL
     with nogil:
@@ -468,27 +461,24 @@ cdef class _Transformer(Base):
         return self._operations
 
     def get_last_used_operation(self):
-        IF (CTE_PROJ_VERSION_MAJOR, CTE_PROJ_VERSION_MINOR) >= (9, 1):
-            cdef PJ* last_used_operation = proj_trans_get_last_used_operation(self.projobj)
-            if last_used_operation == NULL:
-                raise ProjError(
-                    "Last used operation not found. "
-                    "This is likely due to not initiating a transform."
-                )
-            cdef PJ_CONTEXT* context = NULL
-            try:
-                context = pyproj_context_create()
-            except:
-                proj_destroy(last_used_operation)
-                raise
-            proj_assign_context(last_used_operation, context)
-            return _Transformer._from_pj(
-                context,
-                last_used_operation,
-                False,
+        cdef PJ* last_used_operation = proj_trans_get_last_used_operation(self.projobj)
+        if last_used_operation == NULL:
+            raise ProjError(
+                "Last used operation not found. "
+                "This is likely due to not initiating a transform."
             )
-        ELSE:
-            raise NotImplementedError("PROJ 9.1+ required to get last used operation.")
+        cdef PJ_CONTEXT* context = NULL
+        try:
+            context = pyproj_context_create()
+        except:
+            proj_destroy(last_used_operation)
+            raise
+        proj_assign_context(last_used_operation, context)
+        return _Transformer._from_pj(
+            context,
+            last_used_operation,
+            False,
+        )
 
     @property
     def is_network_enabled(self):

pyproj/database.pyx

@@ -38,21 +38,15 @@ cdef dict _PJ_TYPE_MAP = {
     PJType.TRANSFORMATION: PJ_TYPE_TRANSFORMATION,
     PJType.CONCATENATED_OPERATION: PJ_TYPE_CONCATENATED_OPERATION,
     PJType.OTHER_COORDINATE_OPERATION: PJ_TYPE_OTHER_COORDINATE_OPERATION,
+    PJType.DERIVED_PROJECTED_CRS: PJ_TYPE_DERIVED_PROJECTED_CRS,
 }
-IF (CTE_PROJ_VERSION_MAJOR, CTE_PROJ_VERSION_MINOR) >= (9, 2):
-    _PJ_TYPE_MAP[PJType.DERIVED_PROJECTED_CRS] = PJ_TYPE_DERIVED_PROJECTED_CRS
 
 cdef dict _INV_PJ_TYPE_MAP = {value: key for key, value in _PJ_TYPE_MAP.items()}
 
 
 cdef PJ_TYPE get_pj_type(pj_type) except *:
     if not isinstance(pj_type, PJType):
         pj_type = PJType.create(pj_type)
-    IF (CTE_PROJ_VERSION_MAJOR, CTE_PROJ_VERSION_MINOR) < (9, 2):
-        if pj_type is PJType.DERIVED_PROJECTED_CRS:
-            raise NotImplementedError(
-                "DERIVED_PROJECTED_CRS requires PROJ 9.2+"
-            )
     return _PJ_TYPE_MAP[pj_type]
 
 

pyproj/proj.pxi

@@ -122,6 +122,7 @@ cdef extern from "proj.h" nogil:
         double* out_ymax,
         int densify_pts
     )
+    PJ* proj_trans_get_last_used_operation(PJ *P)
     ctypedef struct PJ_AREA
     PJ *proj_create_crs_to_crs_from_pj(
         PJ_CONTEXT *ctx,

setup.py

@@ -8,7 +8,7 @@
 
 from setuptools import Extension, setup
 
-PROJ_MIN_VERSION = (9, 0, 0)
+PROJ_MIN_VERSION = (9, 2, 0)
 CURRENT_FILE_PATH = Path(__file__).absolute().parent
 BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
 INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR

test/conftest.py

@@ -12,11 +12,6 @@
 
 _NETWORK_ENABLED = pyproj.network.is_network_enabled()
 PROJ_LOOSE_VERSION = version.parse(pyproj.__proj_version__)
-PROJ_911 = PROJ_LOOSE_VERSION == version.parse("9.1.1")
-PROJ_GTE_901 = PROJ_LOOSE_VERSION >= version.parse("9.0.1")
-PROJ_GTE_91 = PROJ_LOOSE_VERSION >= version.parse("9.1")
-PROJ_GTE_911 = PROJ_LOOSE_VERSION >= version.parse("9.1.1")
-PROJ_GTE_92 = PROJ_LOOSE_VERSION >= version.parse("9.2.0")
 PROJ_GTE_921 = PROJ_LOOSE_VERSION >= version.parse("9.2.1")
 PROJ_GTE_93 = PROJ_LOOSE_VERSION >= version.parse("9.3.0")
 

test/crs/test_crs.py

@@ -20,14 +20,7 @@
 from pyproj.enums import ProjVersion, WktVersion
 from pyproj.exceptions import CRSError
 from pyproj.transformer import TransformerGroup
-from test.conftest import (
-    PROJ_GTE_91,
-    PROJ_GTE_901,
-    PROJ_GTE_911,
-    PROJ_GTE_921,
-    assert_can_pickle,
-    grids_available,
-)
+from test.conftest import PROJ_GTE_921, assert_can_pickle, grids_available
 
 
 class CustomCRS:
@@ -348,9 +341,6 @@ def test_repr_epsg():
 
 
 def test_repr__undefined():
-    datum_name = "unknown"
-    if PROJ_GTE_901:
-        datum_name = f"{datum_name} using nadgrids=@null"
     assert repr(
         CRS(
             "+proj=merc +a=6378137.0 +b=6378137.0 +nadgrids=@null"
@@ -367,7 +357,7 @@ def test_repr__undefined():
         "Coordinate Operation:\n"
         "- name: unknown to WGS84\n"
         "- method: NTv2\n"
-        f"Datum: {datum_name}\n"
+        "Datum: unknown using nadgrids=@null\n"
         "- Ellipsoid: unknown\n"
         "- Prime Meridian: Greenwich\n"
         "Source CRS: unknown\n"
@@ -440,9 +430,7 @@ def test_datum_unknown():
     datum_name = "Unknown based on WGS84 ellipsoid"
     if PROJ_GTE_921:
         datum_name = "Unknown based on WGS 84 ellipsoid"
-    if PROJ_GTE_901:
-        datum_name = f"{datum_name} using towgs84=0,0,0,0,0,0,0"
-    assert crs.datum.name == datum_name
+    assert crs.datum.name == f"{datum_name} using towgs84=0,0,0,0,0,0,0"
 
 
 def test_epsg__not_found():
@@ -679,17 +667,12 @@ def test_coordinate_operation_grids__alternative_grid_name():
     assert grid.short_name == "ca_nrc_ntv1_can.tif"
     assert grid.package_name == ""
     assert grid.url == "https://cdn.proj.org/ca_nrc_ntv1_can.tif"
-    if (PROJ_GTE_91 and grids_available(grid.short_name, check_network=False)) or (
-        not PROJ_GTE_91 and grids_available(grid.short_name)
-    ):
+    if grids_available(grid.short_name, check_network=False):
         assert grid.available is True
         assert grid.full_name.endswith(grid.short_name)
-    elif PROJ_GTE_911 and pyproj.network.is_network_enabled():
+    elif pyproj.network.is_network_enabled():
         assert grid.available is True
         assert grid.full_name == grid.url
-    elif PROJ_GTE_91 and pyproj.network.is_network_enabled():
-        assert grid.available is True
-        assert grid.full_name == ""
     else:
         assert grid.available is False
         assert grid.full_name == ""

test/crs/test_crs_cf.py

@@ -18,7 +18,7 @@
     VerticalPerspectiveConversion,
 )
 from pyproj.exceptions import CRSError
-from test.conftest import PROJ_GTE_901, PROJ_LOOSE_VERSION
+from test.conftest import PROJ_LOOSE_VERSION
 
 
 def _to_dict(operation):
@@ -82,13 +82,9 @@ def test_to_cf_transverse_mercator():
     )
     towgs84_test = [-122.74, -34.27, -22.83, -1.884, -3.4, -3.03, -15.62]
     horizontal_datum_name = (
-        "Unknown based on International 1924 (Hayford 1909, 1910) ellipsoid"
+        "Unknown based on International 1924 (Hayford 1909, 1910) ellipsoid using "
+        "towgs84=-122.74,-34.27,-22.83,-1.884,-3.400,-3.030,-15.62"
     )
-    if PROJ_GTE_901:
-        horizontal_datum_name = (
-            f"{horizontal_datum_name} using "
-            "towgs84=-122.74,-34.27,-22.83,-1.884,-3.400,-3.030,-15.62"
-        )
     expected_cf = {
         "semi_major_axis": 6378388.0,
         "semi_minor_axis": crs.ellipsoid.semi_minor_metre,

test/crs/test_crs_maker.py

@@ -23,7 +23,7 @@
 from pyproj.crs.datum import CustomDatum
 from pyproj.crs.enums import VerticalCSAxis
 from pyproj.exceptions import CRSError
-from test.conftest import PROJ_GTE_901, assert_can_pickle
+from test.conftest import assert_can_pickle
 
 
 def assert_maker_inheritance_valid(new_crs, class_type):
@@ -98,10 +98,7 @@ def test_geographic_crs__from_methods():
 def test_make_geographic_3d_crs():
     gcrs = GeographicCRS(ellipsoidal_cs=Ellipsoidal3DCS())
     assert gcrs.type_name == "Geographic 3D CRS"
-    expected_authority = ("IGNF", "WGS84GEODD")
-    if PROJ_GTE_901:
-        expected_authority = ("OGC", "CRS84h")
-    assert gcrs.to_authority() == expected_authority
+    assert gcrs.to_authority() == ("OGC", "CRS84h")
 
 
 def test_make_derived_geographic_crs(tmp_path):

test/test_database.py

@@ -11,7 +11,6 @@
     query_utm_crs_info,
 )
 from pyproj.enums import PJType
-from test.conftest import PROJ_GTE_92
 
 
 def test_backwards_compatible_import_paths():
@@ -111,13 +110,7 @@ def test_get_codes__empty(auth, pj_type):
 
 
 def test_get_codes__derived_projected_crs():
-    if PROJ_GTE_92:
-        assert not get_codes("EPSG", PJType.DERIVED_PROJECTED_CRS)
-    else:
-        with pytest.raises(
-            NotImplementedError, match="DERIVED_PROJECTED_CRS requires PROJ 9.2+"
-        ):
-            get_codes("EPSG", PJType.DERIVED_PROJECTED_CRS)
+    assert not get_codes("EPSG", PJType.DERIVED_PROJECTED_CRS)
 
 
 def test_get_codes__invalid_auth():
@@ -152,13 +145,7 @@ def test_query_crs_info(auth, pj_type, deprecated):
 
 
 def test_query_crs_info__derived_projected_crs():
-    if PROJ_GTE_92:
-        assert not query_crs_info(pj_types=PJType.DERIVED_PROJECTED_CRS)
-    else:
-        with pytest.raises(
-            NotImplementedError, match="DERIVED_PROJECTED_CRS requires PROJ 9.2+"
-        ):
-            query_crs_info(pj_types=PJType.DERIVED_PROJECTED_CRS)
+    assert not query_crs_info(pj_types=PJType.DERIVED_PROJECTED_CRS)
 
 
 @pytest.mark.parametrize(