From be853ebe9bf8ec25fc0e98b932afe04046319084 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 10 Sep 2026 17:13:27 -0700 Subject: [PATCH] Upgrade GitHub Actions, drop remaining Python 3.9 references --- .github/workflows/deploy-latest.yml | 6 +++--- .github/workflows/prettier.yml | 4 ++-- .github/workflows/publish.yml | 22 +++++++++++----------- .github/workflows/push_docker_tag.yml | 2 +- .github/workflows/spellcheck.yml | 8 ++++---- .github/workflows/test-coverage.yml | 8 ++++---- .github/workflows/test-pyodide.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- .github/workflows/tmate-mac.yml | 2 +- .github/workflows/tmate.yml | 2 +- setup.py | 3 +-- 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.github/workflows/deploy-latest.yml b/.github/workflows/deploy-latest.yml index 73b123c8..e6cc674e 100644 --- a/.github/workflows/deploy-latest.yml +++ b/.github/workflows/deploy-latest.yml @@ -13,12 +13,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out datasette - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Set up Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: "3.11" - - uses: actions/cache@v4 + - uses: actions/cache@v6 name: Configure pip caching with: path: ~/.cache/pip diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 6dd8b0cd..d92ab82b 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repo - uses: actions/checkout@v5 - - uses: actions/cache@v4 + uses: actions/checkout@v7 + - uses: actions/cache@v6 name: Configure npm caching with: path: ~/.npm diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 80b505ab..43a111e5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,12 +14,12 @@ jobs: matrix: python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v4 + - uses: actions/cache@v6 name: Configure pip caching with: path: ~/.cache/pip @@ -43,12 +43,12 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Set up Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: '3.11' - - uses: actions/cache@v4 + - uses: actions/cache@v6 name: Configure pip caching with: path: ~/.cache/pip @@ -69,12 +69,12 @@ jobs: needs: [deploy] if: "!github.event.release.prerelease" steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Set up Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: - python-version: '3.9' - - uses: actions/cache@v4 + python-version: '3.10' + - uses: actions/cache@v6 name: Configure pip caching with: path: ~/.cache/pip @@ -110,7 +110,7 @@ jobs: needs: [deploy] if: "!github.event.release.prerelease" steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Build and push to Docker Hub env: DOCKER_USER: ${{ secrets.DOCKER_USER }} diff --git a/.github/workflows/push_docker_tag.yml b/.github/workflows/push_docker_tag.yml index d09c9a1b..c5a4f0db 100644 --- a/.github/workflows/push_docker_tag.yml +++ b/.github/workflows/push_docker_tag.yml @@ -13,7 +13,7 @@ jobs: deploy_docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Build and push to Docker Hub env: DOCKER_USER: ${{ secrets.DOCKER_USER }} diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml index 38413e12..bd60934b 100644 --- a/.github/workflows/spellcheck.yml +++ b/.github/workflows/spellcheck.yml @@ -9,12 +9,12 @@ jobs: spellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: - python-version: 3.9 - - uses: actions/cache@v4 + python-version: "3.10" + - uses: actions/cache@v6 name: Configure pip caching with: path: ~/.cache/pip diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index 5c207ba5..b0bcbf9f 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out datasette - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Set up Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: - python-version: 3.9 - - uses: actions/cache@v4 + python-version: "3.10" + - uses: actions/cache@v6 name: Configure pip caching with: path: ~/.cache/pip diff --git a/.github/workflows/test-pyodide.yml b/.github/workflows/test-pyodide.yml index 2456ef2a..89cf8f0f 100644 --- a/.github/workflows/test-pyodide.yml +++ b/.github/workflows/test-pyodide.yml @@ -12,15 +12,15 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Set up Python 3.10 - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: "3.10" cache: 'pip' cache-dependency-path: '**/setup.py' - name: Cache Playwright browsers - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.cache/ms-playwright/ key: ${{ runner.os }}-browsers diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bdf121e6..da1e8249 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,12 +12,12 @@ jobs: matrix: python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v4 + - uses: actions/cache@v6 name: Configure pip caching with: path: ~/.cache/pip diff --git a/.github/workflows/tmate-mac.yml b/.github/workflows/tmate-mac.yml index 623c6e58..f2c074a6 100644 --- a/.github/workflows/tmate-mac.yml +++ b/.github/workflows/tmate-mac.yml @@ -10,6 +10,6 @@ jobs: build: runs-on: macos-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Setup tmate session uses: mxschmitt/action-tmate@v3 diff --git a/.github/workflows/tmate.yml b/.github/workflows/tmate.yml index 75fac052..6d998818 100644 --- a/.github/workflows/tmate.yml +++ b/.github/workflows/tmate.yml @@ -10,6 +10,6 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Setup tmate session uses: mxschmitt/action-tmate@v3 diff --git a/setup.py b/setup.py index 587df20c..21018fac 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ setup( "datasette": ["templates/*.html", "vendored/**/*.txt"], }, include_package_data=True, - python_requires=">=3.9", + python_requires=">=3.10", install_requires=[ "asgiref>=3.2.10", "click>=7.1.1", @@ -105,6 +105,5 @@ setup( "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.9", ], )