From d8eac5151fda1c1aa77d23a3b6f7205b1d9c7a9c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 19 Nov 2025 11:09:47 -0600
Subject: [PATCH 1/2] Update cibuildwheel, drop oddball wheel builds

Updating cibuildwheel ensures we have the latest Python version
support (3.14) as well as other fixes.

It's very unlikely anybody needed the ppc or s390 builds
(if you do, feel free to PR to add them back!) and they just
use CI time.
---
 .github/workflows/wheels.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9d75ed2..8d41181 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -47,14 +47,6 @@ jobs:
             arch_linux: "aarch64"
             extra: " - aarch64"
             artifact-extra: "-aarch64"
-          - os: ubuntu-latest
-            arch_linux: "ppc64le"
-            extra: " - ppc64le"
-            artifact-extra: "-ppc64le"
-          - os: ubuntu-latest
-            arch_linux: "s390x"
-            extra: " - s390x"
-            artifact-extra: "-s390x"
     steps:
     - uses: actions/checkout@v4
 
@@ -64,12 +56,11 @@ jobs:
       with:
         platforms: all
 
-    - uses: pypa/cibuildwheel@v2.22.0
+    - uses: pypa/cibuildwheel@v3.3.0
       env:
         CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
         CIBW_ARCHS_LINUX: ${{ matrix.arch_linux }}
         CIBW_PRERELEASE_PYTHONS: true
-        CIBW_SKIP: "pp* cp38-macosx*"
 
     - name: Verify clean directory
       run: git diff --exit-code

From f97b9291b2ae4a9f3956ad84b097d6176b61e643 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Wed, 19 Nov 2025 11:49:15 -0600
Subject: [PATCH 2/2] use the linux arm64 runner, is faster

---
 .github/workflows/wheels.yml | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 8d41181..82b36eb 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -34,28 +34,16 @@ jobs:
 
 
   build_wheels:
-    name: Wheels on ${{ matrix.os }}${{ matrix.extra }}
+    name: Wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        arch_linux:  ["auto"]
-        extra: [""]
-        include:
-          - os: ubuntu-latest
-            arch_linux: "aarch64"
-            extra: " - aarch64"
-            artifact-extra: "-aarch64"
+        os: [ubuntu-latest, windows-latest, macos-latest, ubuntu-24.04-arm]
+
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up QEMU
-      if: runner.os == 'Linux'
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: all
-
     - uses: pypa/cibuildwheel@v3.3.0
       env:
         CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
@@ -66,10 +54,14 @@ jobs:
       run: git diff --exit-code
       shell: bash
 
+    - name: List wheels
+      run: ls -l wheelhouse/
+      shell: bash
+
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: wheel-${{ matrix.os }}${{ matrix.artifact-extra }}
+        name: wheel-${{ matrix.os }}
         path: wheelhouse/*.whl
         compression-level: 0
         if-no-files-found: error