From d71fb9f9cb2863db806d83166a797f18c01ceaca Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefanv@berkeley.edu>
Date: Wed, 4 Sep 2024 13:56:51 -0700
Subject: [PATCH] Set Windows wheel Python versions

---
 .github/workflows/wheel_tests_and_release.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/wheel_tests_and_release.yml b/.github/workflows/wheel_tests_and_release.yml
index 3a4830c5..1ce6be86 100644
--- a/.github/workflows/wheel_tests_and_release.yml
+++ b/.github/workflows/wheel_tests_and_release.yml
@@ -63,7 +63,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest]
-        cibw_python: [ "cp38-*", "cp39-*", "cp310-*", "cp311-*"]
+        cibw_python: ["cp310-*", "cp311-*", "cp312-*"]
         cibw_arch: [ "x86_64", "arm64"] #, "universal2"]
 
     steps:
@@ -76,16 +76,6 @@ jobs:
         with:
           python-version: '3.10'
 
-      # See:
-      # https://cibuildwheel.readthedocs.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64
-      # https://github.com/pypa/cibuildwheel/issues/1414
-      - name: Install experimental MacOSX Py38
-        if: startsWith(matrix.cibw_python, 'cp38') && (matrix.cibw_arch == 'arm64')
-        run: |
-          curl -o /tmp/Python38.pkg https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg
-          sudo installer -pkg /tmp/Python38.pkg -target /
-          sh "/Applications/Python 3.8/Install Certificates.command"
-
       - name: Install cibuildwheel
         run: |
           python -m pip install cibuildwheel
@@ -116,12 +106,13 @@ jobs:
           path: ./dist/*.whl
 
   build_windows_wheels:
-    name: Build ${{ matrix.cibw_arch }} wheels on ${{ matrix.os }}
+    name: Build python ${{ matrix.cibw_python }} ${{ matrix.cibw_arch }} wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest]
+        cibw_python: ["cp310-*", "cp311-*", "cp312-*"]
         cibw_arch: ["AMD64"]
 
     steps:
@@ -142,8 +133,7 @@ jobs:
         run: |
           python -m cibuildwheel --output-dir dist
         env:
-          # Skip pypy
-          CIBW_BUILD: "cp3?-*"
+          CIBW_BUILD: ${{ matrix.cibw_python }}
           CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_arch }}
           # -Wl,-S equivalent to gcc's -Wl,--strip-debug
           LDFLAGS: "-Wl,-S"