Add support for all EPSG SRIDs (#9)

* Support for all EPSG SRID codes that PYPROJ does.
* Breaking change in return type of get_supported_projections(). Now return a dictionary of dict[srid:str, pyproj.CRS]
* Update packages
* Update CHANGES.md
* Bump version to 0.0.11
* Ditched python version 3.9
* Add test of TWD97
* Upgrade actions
* Remove codecov attempt

Author: josteinl

.github/workflows/branch.yaml

@@ -6,13 +6,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
-        poetry-version: ['1.6.1']
+        python-version: ['3.10', '3.11', '3.12']
+        poetry-version: ['1.8.3']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run image
@@ -23,19 +23,19 @@ jobs:
         run: poetry install
       - name: Run tests
         run: poetry run pytest --cov=./ --cov-report=xml
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+#      - name: Upload coverage to Codecov
+#        uses: codecov/codecov-action@v4
   code-quality:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
-        poetry-version: ['1.6.1']
+        python-version: ['3.10', '3.11', '3.12']
+        poetry-version: ['1.8.3']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run image
@@ -51,6 +51,6 @@ jobs:
       - name: Run bandit
         run: poetry run bandit .
       - name: Run safety
-        run: poetry run safety check
+        run: poetry run safety check -i 70612
       - name: Check for acceptable licenses
-        run: poetry run pip-licenses --allow-only="MIT License;BSD License;Python Software Foundation License;Apache Software License;Mozilla Public License 2.0 (MPL 2.0)"
+        run: poetry run pip-licenses --allow-only="MIT License;BSD License;Python Software Foundation License;Apache Software License;Mozilla Public License 2.0 (MPL 2.0);The Unlicense (Unlicense);ISC License (ISCL)"

.github/workflows/release.yaml

@@ -9,13 +9,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.11']
-        poetry-version: ['1.7.1']
+        python-version: ['3.12']
+        poetry-version: ['1.8.3']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run image

CHANGES.md

@@ -1,5 +1,14 @@
 # NGI Python Coordinate Projector Package
 
+
+_2024-08-13_
+
+Version 0.0.11
+
+Add
+
+- Support for all EPSG SRID codes that PYPROJ does.
+
 _2024-01-15_
 
 Version 0.0.10

README.md

@@ -49,7 +49,7 @@ print(f"{projected_east=}, {projected_north=}")
 
    - Python 3.9 or higher
    - Poetry
-   - black code formatter
+   - Ruff code formatter
 
 2. Clone this repository
 

poetry.lock

@@ -15,7 +15,7 @@ exclude = '''
 
 [tool.poetry]
 name = "coordinate-projector"
-version = "0.0.10"
+version = "0.0.11"
 description = "Project points from one projection to another using pyproj"
 license = "MIT"
 authors = ["Helge Smebye", "Jostein Leira <jostein@leira.net>"]
@@ -38,19 +38,18 @@ packages = [
 line-length = 120
 src = ["src", "tests"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4"
+python = ">=3.10,<4"
 pyproj = "^3.6.1"
 python-dateutil = "^2.8.2"
 types-python-dateutil = "^2.8.19"
 timezonefinder = "*"
 
 
 [tool.poetry.group.dev.dependencies]
-black = "*"
 pytest = "*"
 pytest-cov = "*"
 mypy = "*"

pyproject.toml

@@ -1,8 +1,9 @@
 """
 Datetime utilities for converting to and from datetime.datetime, json, naive and time zone aware
 """
+
 from datetime import datetime
-from typing import Optional
+
 
 from dateutil import tz
 from timezonefinder import TimezoneFinder
@@ -11,15 +12,15 @@
 
 projector = Projector()
 
-_time_zone_finder: Optional[TimezoneFinder] = None
+_time_zone_finder: TimezoneFinder | None = None
 
 
 def ensure_tz(
-    dt: Optional[datetime],
-    longitude: Optional[float] = None,
-    latitude: Optional[float] = None,
+    dt: datetime | None,
+    longitude: float | None = None,
+    latitude: float | None = None,
     srid: int = 4326,
-) -> Optional[datetime]:
+) -> datetime | None:
     """
     Return passed datetime dt enriched with timezone.
 
@@ -43,8 +44,6 @@ def ensure_tz(
         # timezone naive (no time zone in dt)
         if longitude is not None and latitude is not None:
             if srid and srid != 4326:
-                # TODO: Use a single common transformer for the whole library
-
                 longitude, latitude = projector.transform(from_srid=srid, to_srid=4326, east=longitude, north=latitude)
 
             # find timezone from position
@@ -62,11 +61,11 @@ def ensure_tz(
 
 
 def datetime_to_json(
-    dt: Optional[datetime],
-    longitude: Optional[float] = None,
-    latitude: Optional[float] = None,
+    dt: datetime | None,
+    longitude: float | None = None,
+    latitude: float | None = None,
     srid: int = 4326,
-) -> Optional[str]:
+) -> str | None:
     """
     Return passed datetime.datetime as json-formatted (iso-8601) string with UTC timezone. Sub-second time information
     is removed.