From dfb2dbe9676e5e8c38fd637ab29ef830893a9075 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Sun, 23 Nov 2025 12:12:29 -0800
Subject: [PATCH] Update GitHub Actions workflow cache configuration

---
 .github/workflows/publish.yml             | 18 ++++--------------
 .github/workflows/spellcheck.yml          |  9 ++-------
 .github/workflows/test-coverage.yml       |  9 ++-------
 .github/workflows/test-sqlite-support.yml |  1 +
 .github/workflows/test.yml                | 11 +++--------
 5 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e9aba82..a393230 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,13 +17,8 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: actions/cache@v4
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         pip install -e '.[test]'
@@ -39,13 +34,8 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: '3.13'
-    - uses: actions/cache@v4
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-publish-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-publish-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         pip install setuptools wheel twine
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
index a3d5532..8843120 100644
--- a/.github/workflows/spellcheck.yml
+++ b/.github/workflows/spellcheck.yml
@@ -11,13 +11,8 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: "3.12"
-    - uses: actions/cache@v4
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         pip install -e '.[docs]'
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
index a710e41..0aa8986 100644
--- a/.github/workflows/test-coverage.yml
+++ b/.github/workflows/test-coverage.yml
@@ -17,13 +17,8 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: "3.11"
-    - uses: actions/cache@v4
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install SpatiaLite
       run: sudo apt-get install libsqlite3-mod-spatialite
     - name: Install Python dependencies
diff --git a/.github/workflows/test-sqlite-support.yml b/.github/workflows/test-sqlite-support.yml
index fe93865..5c8a9a4 100644
--- a/.github/workflows/test-sqlite-support.yml
+++ b/.github/workflows/test-sqlite-support.yml
@@ -26,6 +26,7 @@ jobs:
         allow-prereleases: true
         cache: pip
         cache-dependency-path: setup.py
+        cache-dependency-path: setup.py
     - name: Set up SQLite ${{ matrix.sqlite-version }}
       uses: asg017/sqlite-versions@71ea0de37ae739c33e447af91ba71dda8fcf22e6
       with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c21c92..93ced81 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14-dev", "3.14t-dev"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         numpy: [0, 1]
         os: [ubuntu-latest, macos-latest, windows-latest, macos-14]
     steps:
@@ -20,13 +20,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
-    - uses: actions/cache@v4
-      name: Configure pip caching
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        cache: pip
+        cache-dependency-path: setup.py
     - name: Install dependencies
       run: |
         pip install -e '.[test,mypy,flake8]'