From 13bc2ca13025d45e4ddc9821501fce63e38c149c Mon Sep 17 00:00:00 2001
From: Theron Luhn <theron@luhn.com>
Date: Mon, 25 Aug 2025 10:54:03 -0700
Subject: [PATCH 1/3] Move to latest Github Actions images.

---
 .github/workflows/ci-tests.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 37f0d86cd..15828e4fa 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -22,26 +22,26 @@ jobs:
                     - "3.12"
                     - "pypy-3.8"
                 os:
-                    - "ubuntu-20.04"
-                    - "windows-2022"
-                    - "macos-11"
+                    - "ubuntu-latest"
+                    - "windows-latest"
+                    - "macos-latest"
                 architecture:
                     - x64
                     - x86
 
                 include:
-                    # Only run coverage on ubuntu-20.04, except on pypy3
-                    - os: "ubuntu-20.04"
+                    # Only run coverage on ubuntu-latest, except on pypy3
+                    - os: "ubuntu-latest"
                       pytest-args: "--cov"
-                    - os: "ubuntu-20.04"
+                    - os: "ubuntu-latest"
                       py: "pypy-3.8"
                       pytest-args: ""
 
                 exclude:
-                    # Linux and macOS don't have x86 python
-                    - os: "ubuntu-20.04"
+                    # Linux doesn't have x86 python
+                    - os: "ubuntu-latest"
                       architecture: x86
-                    - os: "macos-11"
+                    - os: "macos-latest"
                       architecture: x86
 
         name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
@@ -57,7 +57,7 @@ jobs:
             - name: Running tox
               run: tox -e py -- ${{ matrix.pytest-args }}
     coverage:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         name: Validate coverage
         steps:
             - uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
             - run: pip install tox
             - run: tox -e py312-cover,coverage
     docs:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         name: Build the documentation
         steps:
             - uses: actions/checkout@v4
@@ -81,7 +81,7 @@ jobs:
             - run: pip install tox
             - run: tox -e docs
     lint:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         name: Lint the package
         steps:
             - uses: actions/checkout@v4

From 85bf5a6b61836664534a196f4b43400de5b53778 Mon Sep 17 00:00:00 2001
From: Theron Luhn <theron@luhn.com>
Date: Mon, 25 Aug 2025 10:59:34 -0700
Subject: [PATCH 2/3] Remove architecture.

---
 .github/workflows/ci-tests.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 15828e4fa..da5991d43 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -25,9 +25,6 @@ jobs:
                     - "ubuntu-latest"
                     - "windows-latest"
                     - "macos-latest"
-                architecture:
-                    - x64
-                    - x86
 
                 include:
                     # Only run coverage on ubuntu-latest, except on pypy3
@@ -37,14 +34,7 @@ jobs:
                       py: "pypy-3.8"
                       pytest-args: ""
 
-                exclude:
-                    # Linux doesn't have x86 python
-                    - os: "ubuntu-latest"
-                      architecture: x86
-                    - os: "macos-latest"
-                      architecture: x86
-
-        name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
+        name: "Python: ${{ matrix.py }} on ${{ matrix.os }}"
         runs-on: ${{ matrix.os }}
         steps:
             - uses: actions/checkout@v4
@@ -52,7 +42,6 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.py }}
-                  architecture: ${{ matrix.architecture }}
             - run: pip install tox
             - name: Running tox
               run: tox -e py -- ${{ matrix.pytest-args }}
@@ -65,7 +54,6 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: 3.12
-                  architecture: x64
             - run: pip install tox
             - run: tox -e py312-cover,coverage
     docs:
@@ -77,7 +65,6 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: 3.8
-                  architecture: x64
             - run: pip install tox
             - run: tox -e docs
     lint:
@@ -89,6 +76,5 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: 3.8
-                  architecture: x64
             - run: pip install tox
             - run: tox -e lint

From e52f48b17222a7b9d0a585bcf9c300d2edf6f28b Mon Sep 17 00:00:00 2001
From: Theron Luhn <theron@luhn.com>
Date: Mon, 25 Aug 2025 11:01:44 -0700
Subject: [PATCH 3/3] Remove `--cov` from tests.

---
 .github/workflows/ci-tests.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index da5991d43..4ef27902a 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -26,14 +26,6 @@ jobs:
                     - "windows-latest"
                     - "macos-latest"
 
-                include:
-                    # Only run coverage on ubuntu-latest, except on pypy3
-                    - os: "ubuntu-latest"
-                      pytest-args: "--cov"
-                    - os: "ubuntu-latest"
-                      py: "pypy-3.8"
-                      pytest-args: ""
-
         name: "Python: ${{ matrix.py }} on ${{ matrix.os }}"
         runs-on: ${{ matrix.os }}
         steps: