dropping support for python 3.8, 3.9

Author: whubsch

.github/workflows/test.yml

@@ -1,27 +1,52 @@
-name: version & unit testing
+name: Tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [main]
+    paths:
+      - "src/**"
+      - "tests/**"
+      - "pyproject.toml"
+      - "requirements*.txt"
+      - "tox.ini"
+      - ".github/workflows/test.yml"
+  pull_request:
+    branches: [main]
+    paths:
+      - "src/**"
+      - "tests/**"
+      - "pyproject.toml"
+      - "requirements*.txt"
+      - "tox.ini"
+      - ".github/workflows/test.yml"
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+      fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install usaddress regex pytest pydantic
+      - name: Cache pip
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt', '**/pyproject.toml', '**/setup.py') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Install tox
+        run: python -m pip install --upgrade pip tox
 
-      - name: Run pytest
-        run: python -m pytest
+      - name: Run tests with tox
+        run: tox -e py

pyproject.toml

@@ -7,25 +7,24 @@ name = "overturetoosm"
 dynamic = ["version"]
 description = 'Translate the Overture maps schema to OpenStreetMap tags.'
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 license = "MIT"
 keywords = ["overture", "osm", "openstreetmap", "mapping", "overture maps"]
 authors = [{ name = "Will", email = "wahubsch@gmail.com" }]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "License :: OSI Approved :: MIT License",
     "Typing :: Typed",
 ]
-dependencies = ["pydantic>=2.8.0", "pytest>=8.3.2"]
+dependencies = ["pydantic>=2.11.7"]
 
 [project.urls]
 Documentation = "https://whubsch.github.io/overturetoosm/index.html"
@@ -57,7 +56,7 @@ exclude_lines = ["no cov", "if __name__ == .__main__.:", "if TYPE_CHECKING:"]
 fix = true
 
 [tool.ruff.lint]
-select = ["D", "E", "F", "I", "N", "SIM", "TCH"]
+select = ["D", "E", "F", "I", "SIM", "UP", "W"]
 pydocstyle.convention = "google"
 exclude = ["tests/*", "scripts/*"]
 isort.split-on-trailing-comma = false

requirements.txt

@@ -1,2 +1,2 @@
-pydantic>=2.8.0
+pydantic>=2.11.7
 pytest>=8.3.2

scripts/get_wiki.py

@@ -1,13 +1,12 @@
 import json
 import logging
 import re
-from typing import List, Dict
 
 import requests
 from bs4 import BeautifulSoup
 
 
-def equals_to_dict(pairs: List[str]) -> Dict[str, str]:
+def equals_to_dict(pairs: list[str]) -> dict[str, str]:
     """Convert a string in the format "key=value" into a dictionary."""
     return {
         key.strip(): value.strip() for key, value in (pair.split("=") for pair in pairs)

scripts/write_tags.py

@@ -7,8 +7,8 @@
 tags_filled = {k: v for k, v in tags.items() if v}
 
 new_dict_str = json.dumps(tags_filled, indent=4).replace(":", ": ")
-pattern = r"places_tags: Dict\[str, Dict\[str, str\]\]\s*=\s*\{.*\}"
-replacement = f"places_tags: Dict[str, Dict[str, str]] = {new_dict_str}"
+pattern = r"places_tags: dict\[str, dict\[str, str\]\]\s*=\s*\{.*\}"
+replacement = f"places_tags: dict[str, dict[str, str]] = {new_dict_str}"
 
 with open("src/overturetoosm/resources.py", "r", encoding="utf-8") as f:
     contents = f.read()

src/overturetoosm/addresses.py

@@ -1,11 +1,9 @@
 """Convert Overture's `addresses` features to OSM tags."""
 
-from typing import Dict
-
 from .objects import AddressProps
 
 
-def process_address(props: dict, style: str = "US") -> Dict[str, str]:
+def process_address(props: dict, style: str = "US") -> dict[str, str]:
     """Convert Overture's address properties to OSM tags.
 
     Args:
@@ -14,7 +12,7 @@ def process_address(props: dict, style: str = "US") -> Dict[str, str]:
             a pull request or issue to add support for other regions. Defaults to "US".
 
     Returns:
-        Dict[str, str]: The reshaped and converted properties in OSM's flat
+        dict[str, str]: The reshaped and converted properties in OSM's flat
             str:str schema.
     """
     return AddressProps(**props).to_osm(style)

src/overturetoosm/buildings.py

@@ -1,19 +1,17 @@
 """Convert Overture's `buildings` features to OSM tags."""
 
-from typing import Dict
-
 from .objects import BuildingProps
 
 
-def process_building(props: dict, confidence: float = 0.0) -> Dict[str, str]:
+def process_building(props: dict, confidence: float = 0.0) -> dict[str, str]:
     """Convert Overture's building properties to OSM tags.
 
     Args:
         props (dict): The feature properties from the Overture GeoJSON.
         confidence (float, optional): The minimum confidence level. Defaults to 0.0.
 
     Returns:
-        Dict[str, str]: The reshaped and converted properties in OSM's flat
+        dict[str, str]: The reshaped and converted properties in OSM's flat
             str:str schema.
 
     Raises:

src/overturetoosm/cli.py

@@ -70,7 +70,7 @@ def main():
 
     args = parser.parse_args()
 
-    with open(args.input, "r", encoding="utf-8") as f:
+    with open(args.input, encoding="utf-8") as f:
         contents: dict = json.load(f)
         geojson = {}
         if args.fx_type == "place":