From d621be25022e0976f6a4ed779b8d770a39ab27d6 Mon Sep 17 00:00:00 2001
From: Theron Luhn <theron@luhn.com>
Date: Thu, 10 Oct 2024 10:56:37 -0700
Subject: [PATCH 1/3] Remove architecture from Actions build matrix.

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 1a2f79f7..5164e36b 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -28,9 +28,6 @@ jobs:
                     - "ubuntu-latest"
                     - "windows-latest"
                     - "macos-latest"
-                architecture:
-                    - x64
-                    - x86
                 include:
                   - py: "pypy-3.8"
                     toxenv: "pypy38"
@@ -39,11 +36,6 @@ jobs:
                   - py: "pypy-3.10"
                     toxenv: "pypy310"
                 exclude:
-                    # Linux and macOS don't have x86 python
-                    - os: "ubuntu-latest"
-                      architecture: x86
-                    - os: "macos-latest"
-                      architecture: x86
                     # Don't run all PyPy versions except latest on
                     # Windows/macOS. They are expensive to run.
                     - os: "windows-latest"
@@ -63,7 +55,6 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.py }}
-                  architecture: ${{ matrix.architecture }}
             - run: pip install tox
             - name: Running tox with specific toxenv
               if: ${{ matrix.toxenv != '' }}

From 9973a6c325cdd0a2497336af13847990753d7931 Mon Sep 17 00:00:00 2001
From: Theron Luhn <theron@luhn.com>
Date: Thu, 10 Oct 2024 11:10:57 -0700
Subject: [PATCH 2/3] Remove tests for pypy3.8

Pypy3.8 is prone to segfaults running pytest.  This has been fixed in
3.9 and 3.10 (https://pypy.org/posts/2024/03/fixing-bug-incremental-gc.html)
but 3.8 is no longer supported and has not been fixed.
---
 .github/workflows/ci-tests.yml | 7 -------
 tox.ini                        | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 5164e36b..60112b1a 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -21,7 +21,6 @@ jobs:
                     - "3.10"
                     - "3.11"
                     - "3.12"
-                    - "pypy-3.8"
                     - "pypy-3.9"
                     - "pypy-3.10"
                 os:
@@ -29,8 +28,6 @@ jobs:
                     - "windows-latest"
                     - "macos-latest"
                 include:
-                  - py: "pypy-3.8"
-                    toxenv: "pypy38"
                   - py: "pypy-3.9"
                     toxenv: "pypy39"
                   - py: "pypy-3.10"
@@ -38,10 +35,6 @@ jobs:
                 exclude:
                     # Don't run all PyPy versions except latest on
                     # Windows/macOS. They are expensive to run.
-                    - os: "windows-latest"
-                      py: "pypy-3.8"
-                    - os: "macos-latest"
-                      py: "pypy-3.8"
                     - os: "windows-latest"
                       py: "pypy-3.9"
                     - os: "macos-latest"
diff --git a/tox.ini b/tox.ini
index 90655e83..d27c853e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint,
-    py38,py39,py310,py311,py312,pypy38,pypy39,pypy310,
+    py38,py39,py310,py311,py312,pypy39,pypy310,
     coverage,
     docs,
 isolated_build = True
@@ -10,7 +10,6 @@ isolated_build = True
 commands =
     python --version
     python -m pytest \
-    pypy38: --no-cov \
     pypy39: --no-cov \
     pypy310: --no-cov \
         {posargs:}

From 9338d12f34a9d97ca3b40b37d03a287dafd6f6d3 Mon Sep 17 00:00:00 2001
From: Theron Luhn <theron@luhn.com>
Date: Thu, 10 Oct 2024 11:26:16 -0700
Subject: [PATCH 3/3] Remove lingering reference to architecture.

---
 .github/workflows/ci-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 60112b1a..f779e1c9 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -40,7 +40,7 @@ jobs:
                     - os: "macos-latest"
                       py: "pypy-3.9"
 
-        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