chore: configure uv

Author: scorix

.github/workflows/release.yml

@@ -20,13 +20,25 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: python:3.12-bookworm
+    env:
+      UV_LINK_MODE: copy
+      UV_CACHE_DIR: /github/home/.cache/uv
     permissions:
+      actions: write
       contents: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Cache uv downloads/builds
+        uses: actions/cache@v5
+        with:
+          path: /github/home/.cache/uv
+          key: uvcache-${{ runner.os }}-${{ hashFiles('uv.lock', 'pyproject.toml') }}
+          restore-keys: |
+            uvcache-${{ runner.os }}-
+
       - name: Extract version from tag
         id: version
         run: |
@@ -46,11 +58,15 @@ jobs:
       - name: Install system dependencies
         run: |
           apt-get update
+          # Ensure /etc/os-release exists (required by some actions' OS detection).
+          apt-get install -y base-files
           apt-get install -y build-essential pkg-config libbz2-dev
           apt-get install -y -t sid libmapnik-dev
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: false
 
       - name: Build wheel and sdist
         run: |

.github/workflows/test.yml

@@ -13,14 +13,26 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: python:3.12-bookworm
+    env:
+      UV_LINK_MODE: copy
+      UV_CACHE_DIR: /github/home/.cache/uv
     permissions:
+      actions: write
       contents: read
       checks: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Cache uv downloads/builds
+        uses: actions/cache@v5
+        with:
+          path: /github/home/.cache/uv
+          key: uvcache-${{ runner.os }}-${{ hashFiles('uv.lock', 'pyproject.toml') }}
+          restore-keys: |
+            uvcache-${{ runner.os }}-
+
       - name: Add Debian sid repository
         run: |
           echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list
@@ -29,18 +41,26 @@ jobs:
       - name: Install system dependencies
         run: |
           apt-get update
+          # Ensure /etc/os-release exists (required by some actions' OS detection).
+          apt-get install -y base-files
           apt-get install -y build-essential pkg-config libbz2-dev
           apt-get install -y -t sid libmapnik-dev fonts-noto-cjk
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v7
         with:
-          enable-cache: true
-          cache-dependency-glob: "uv.lock"
+          # Work around container-job failures determining Linux distribution during
+          # setup-uv's built-in caching path; we cache UV_CACHE_DIR ourselves above.
+          enable-cache: false
 
       - name: Install Python dependencies and build package
         run: |
-          uv sync --frozen --verbose || uv sync --verbose
+          # Use lockfile when present; avoid doing two full syncs (which can rebuild twice).
+          if [ -f uv.lock ]; then
+            uv sync --extra test --frozen --verbose
+          else
+            uv sync --extra test --verbose
+          fi
 
       - name: Run tests with coverage
         run: |

pyproject.toml

@@ -24,6 +24,12 @@ maintainers = [
 
 requires-python = ">= 3.8"
 
+[project.optional-dependencies]
+test = [
+    "pytest >= 8.0",
+    "pytest-cov >= 5.0",
+]
+
 [project.urls]
 Homepage = "https://mapnik.org"
 Documentation = "https://github.com/mapnik/python-mapnik/wiki"
@@ -35,4 +41,8 @@ Changelog = "https://github.com/mapnik/python-mapnik/blob/master/CHANGELOG.md"
 minversion = "8.0"
 testpaths = [
     "test/python_tests",
-]
+]
+
+[tool.uv]
+# Pin uv version for CI/dev consistency (used by astral-sh/setup-uv).
+required-version = "==0.9.25"

src/mapnik_map.cpp

@@ -295,7 +295,7 @@ void export_map(py::module const& m)
              "<mapnik._mapnik.Featureset object at 0x23b0b0>\n"
              ">>> featureset.features\n"
              ">>> [<mapnik.Feature object at 0x3995630>]\n",
-             py::arg("layer idx"), py::arg("x"), py::arg("y")
+             py::arg("layer_idx"), py::arg("x"), py::arg("y")
             )
 
         .def("remove_all", &Map::remove_all,