Modernize CI (#85)

Author: rth

.github/workflows/main.yml

@@ -0,0 +1,45 @@
+name: Test
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - python-version: "3.10"
+            optional-deps: true
+            dependencies: "pandas==1.5.3 numpy==1.24.4"
+          - python-version: "3.11"
+            optional-deps: false
+            dependencies: "pandas==2.0.3 numpy==1.24.4"
+          - python-version: "3.11"
+            optional-deps: true
+            dependencies: "pandas==2.1.4 numpy==1.26.4"
+          - python-version: "3.13"
+            optional-deps: false
+            dependencies: "pandas>2.2.0"
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: astral-sh/setup-uv@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        uv pip install ${{ matrix.dependencies }}
+        if [ "${{ matrix.optional-deps }}" = "true" ]; then
+          uv pip install thefuzz[speedup]
+        fi
+        uv pip install -e .
+    - name: Test with pytest
+      run: |
+        uv pip install pytest pytest-httpserver
+        pytest

.github/workflows/python-tests.yml

@@ -6,15 +6,15 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.8.6"
+    rev: "v0.11.2"
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
 
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.15.0
     hooks:
      -  id: mypy
         files: ".+.py"

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ For additional documentation see
 
 # Installation
 
-pgeocode requires Python 3.10+ as well as `numpy` and `pandas` packages.
+pgeocode requires Python 3.10+ and the pandas 1.5.0+ package.
 It can be installed with,
 
 ```

README.md

@@ -183,7 +183,5 @@
 # The following is used by sphinx.ext.linkcode to provide links to github
 linkcode_resolve = make_linkcode_resolve(
     "pgeocode",
-    "https://github.com/symerio/"
-    "pgeocode/blob/{revision}/"
-    "{package}/{path}#L{lineno}",
+    "https://github.com/symerio/pgeocode/blob/{revision}/{package}/{path}#L{lineno}",
 )

doc/conf.py

@@ -213,7 +213,7 @@ def test_open_extract_url(httpserver):
     "download_url",
     [
         "https://download.geonames.org/export/zip/{country}.zip",
-        "https://symerio.github.io/postal-codes-data/data/" "geonames/{country}.txt",
+        "https://symerio.github.io/postal-codes-data/data/geonames/{country}.txt",
     ],
     ids=["geonames", "gitlab-pages"],
 )
@@ -245,8 +245,7 @@ def test_first_url_fails(httpserver, monkeypatch, temp_dir):
         "DOWNLOAD_URL",
         [
             httpserver.url_for(download_url),
-            "https://symerio.github.io/postal-codes-data/data/"
-            "geonames/{country}.txt",
+            "https://symerio.github.io/postal-codes-data/data/geonames/{country}.txt",
         ],
     )
     msg = "IE.txt failed with: HTTP Error 404.*Trying next URL"