From 8e437e24b19ff5603fec9a5ca391858128d745ce Mon Sep 17 00:00:00 2001
From: Joshua Munn <public@elysee-munn.family>
Date: Mon, 10 Apr 2023 16:00:17 +0100
Subject: [PATCH 1/2] Make sure x64 linux wheels are built

---
 .github/workflows/build.yml | 66 ++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fbcc236..4a6fe51 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,50 +23,63 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
         python: [37, 38, 39, 310, 311]
-        bitness: [32, 64]
-        include:
-          # Run 32 and 64 bit version in parallel for Linux and Windows
+        platform_id:
+          - win_amd64
+          - win32
+          - manylinux_x86_64
+          - manylinux_i686
+          - manylinux_aarch64
+          - macosx_x86_64
+          - macosx_universal2
+        exclude:
+          # Skip Linux and Mac builds on Windows
           - os: windows-latest
-            bitness: 64
-            platform_id: win_amd64
+            platform_id: manylinux_aarch64
+          - os: windows-latest
+            platform_id: manylinux_i686
           - os: windows-latest
-            bitness: 32
-            platform_id: win32
-          - os: ubuntu-latest
-            bitness: 64
             platform_id: manylinux_x86_64
+          - os: windows-latest
+            platform_id: macosx_universal2
+          - os: windows-latest
+            platform_id: macosx_x86_64
+          # Skip Mac and Windows builds on Linux
           - os: ubuntu-latest
-            bitness: 32
-            platform_id: manylinux_i686
+            platform_id: macosx_x86_64
           - os: ubuntu-latest
-            bitness: 64
-            platform_id: manylinux_aarch64
+            platform_id: macosx_universal2
+          - os: ubuntu-latest
+            platform_id: win_amd64
+          - os: ubuntu-latest
+            platform_id: win32
+          # Skip Linux and Windows builds on Mac
           - os: macos-latest
-            bitness: 64
-            platform_id: macosx_x86_64
+            platform_id: win_amd64
           - os: macos-latest
-            bitness: 64
-            platform_id: macosx_universal2
+            platform_id: win32
+          - os: macos-latest
+            platform_id: manylinux_x86_64
+          - os: macos-latest
+            platform_id: manylinux_i686
+          - os: macos-latest
+            platform_id: manylinux_aarch64
           # Python 3.7 does not have universal2 wheel support yet
           - os: macos-latest
             python: 37
-            platform_id: macosx_x86_64
+            platform_id: macosx_universal2
           # Python 3.8 and onwards only need universal2 wheels
           - os: macos-latest
             python: 38
-            platform_id: macosx_universal2
+            platform_id: macosx_x86_64
           - os: macos-latest
             python: 39
-            platform_id: macosx_universal2
+            platform_id: macosx_x86_64
           - os: macos-latest
             python: 310
-            platform_id: macosx_universal2
+            platform_id: macosx_x86_64
           - os: macos-latest
             python: 311
-            platform_id: macosx_universal2
-        exclude:
-          - os: macos-latest
-            bitness: 32
+            platform_id: macosx_x86_64
     env:
       CIBW_ARCHS_LINUX: auto aarch64
       CIBW_ARCHS_MACOS: x86_64 universal2
@@ -81,7 +94,8 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
-        if: runner.os == 'Linux'
+        if: |
+          runner.os == 'Linux' && (matrix.platform_id == 'manylinux_aarch64' || matrix.platform_id == 'manylinux_i686')
         uses: docker/setup-qemu-action@v2
         with:
           platforms: all

From cd4c9de33a412e153b98e08a5403dec10c823ef8 Mon Sep 17 00:00:00 2001
From: Joshua Munn <public@elysee-munn.family>
Date: Thu, 5 Oct 2023 21:53:01 +0100
Subject: [PATCH 2/2] Add Python 312 to CI matrix

---
 .github/workflows/build.yml  | 2 +-
 .github/workflows/tests.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4a6fe51..d020f19 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        python: [37, 38, 39, 310, 311]
+        python: [37, 38, 39, 310, 311, 312]
         platform_id:
           - win_amd64
           - win32
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 74d33ad..1871501 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3
@@ -22,4 +22,4 @@ jobs:
         python -m pip install --upgrade pip
         pip install tox tox-gh-actions
     - name: Test with tox
-      run: tox
\ No newline at end of file
+      run: tox