Skip to content

Commit f2dd23b

Browse files
authored
DEP: Minimum PROJ version 9.4 (#1481)
1 parent f7241b9 commit f2dd23b

File tree

8 files changed

+13
-21
lines changed

8 files changed

+13
-21
lines changed

.github/workflows/tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
python-version: ['3.10', '3.11', '3.12']
44-
proj-version: ['9.4.0']
44+
proj-version: ['9.6.0']
4545
include:
4646
- python-version: '3.10'
47-
proj-version: '9.3.1'
47+
proj-version: '9.5.1'
4848
- python-version: '3.10'
49-
proj-version: '9.2.1'
49+
proj-version: '9.4.1'
5050
steps:
5151
- uses: actions/checkout@v4
5252

docs/history.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Change Log
33

44
Latest
55
------
6+
- DEP: Minimum PROJ version 9.4 (pull #1481)
67

78
3.7.1
89
------

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Python interface to `PROJ <https://proj.org/>`_ (cartographic projections and c
55

66
GitHub Repository: https://github.com/pyproj4/pyproj
77

8-
.. note:: Minimum supported PROJ version is 9.2
8+
.. note:: Minimum supported PROJ version is 9.4
99

1010
.. note:: Minimum supported Python version is 3.10
1111

docs/installation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ pyproj PROJ
8383
3.4+ 8.2+
8484
3.5+ 9+
8585
3.7+ 9.2+
86+
3.8+ 9.4+
8687
============ ============
8788

8889
Setup PROJ

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from setuptools import Extension, setup
1010

11-
PROJ_MIN_VERSION = (9, 2, 0)
11+
PROJ_MIN_VERSION = (9, 4, 0)
1212
CURRENT_FILE_PATH = Path(__file__).absolute().parent
1313
BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
1414
INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR

test/conftest.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
_NETWORK_ENABLED = pyproj.network.is_network_enabled()
1414
PROJ_LOOSE_VERSION = version.parse(pyproj.__proj_version__)
15-
PROJ_GTE_921 = PROJ_LOOSE_VERSION >= version.parse("9.2.1")
16-
PROJ_GTE_93 = PROJ_LOOSE_VERSION >= version.parse("9.3.0")
1715
PROJ_GTE_941 = PROJ_LOOSE_VERSION >= version.parse("9.4.1")
1816
PROJ_GTE_95 = PROJ_LOOSE_VERSION >= version.parse("9.5.0")
1917

test/crs/test_crs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from pyproj.enums import ProjVersion, WktVersion
2121
from pyproj.exceptions import CRSError
2222
from pyproj.transformer import TransformerGroup
23-
from test.conftest import PROJ_GTE_921, PROJ_GTE_941, assert_can_pickle, grids_available
23+
from test.conftest import PROJ_GTE_941, assert_can_pickle, grids_available
2424

2525

2626
class CustomCRS:
@@ -427,10 +427,10 @@ def test_datum_unknown():
427427
"+k=1 +x_0=0 +y_0=0 +gamma=0 +ellps=WGS84 "
428428
"+towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
429429
)
430-
datum_name = "Unknown based on WGS84 ellipsoid"
431-
if PROJ_GTE_921:
432-
datum_name = "Unknown based on WGS 84 ellipsoid"
433-
assert crs.datum.name == f"{datum_name} using towgs84=0,0,0,0,0,0,0"
430+
assert (
431+
crs.datum.name
432+
== "Unknown based on WGS 84 ellipsoid using towgs84=0,0,0,0,0,0,0"
433+
)
434434

435435

436436
def test_epsg__not_found():

test/test_transformer.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from pyproj.enums import TransformDirection
1919
from pyproj.exceptions import ProjError
2020
from pyproj.transformer import AreaOfInterest, TransformerGroup
21-
from test.conftest import PROJ_GTE_93, grids_available, proj_env, proj_network_env
21+
from test.conftest import grids_available, proj_env, proj_network_env
2222

2323

2424
def test_tranform_wgs84_to_custom():
@@ -535,14 +535,6 @@ def test_repr__conditional():
535535
"Description: unavailable until proj_trans is called\n"
536536
"Area of Use:\n- undefined"
537537
)
538-
elif not PROJ_GTE_93:
539-
assert trans_repr == (
540-
"<Unknown Transformer: noop>\n"
541-
"Description: Transformation from EGM2008 height to WGS 84 "
542-
"(ballpark vertical transformation, without ellipsoid height "
543-
"to vertical height correction)\n"
544-
"Area of Use:\n- undefined"
545-
)
546538
else:
547539
assert trans_repr == (
548540
"<Other Coordinate Operation Transformer: noop>\n"

0 commit comments

Comments
 (0)