From cd4660f49b6a80908fb34e7c6c78a6755a54d6cd Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Mon, 20 Jan 2025 13:54:39 -0700
Subject: [PATCH] go back to using python.org installer directly

---
 .../config/macos-pkg-choices-freethreaded.xml | 14 +++++++++++
 .github/workflows/wheel-builder.yml           | 25 ++++++++++++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/config/macos-pkg-choices-freethreaded.xml

diff --git a/.github/workflows/config/macos-pkg-choices-freethreaded.xml b/.github/workflows/config/macos-pkg-choices-freethreaded.xml
new file mode 100644
index 00000000..1a6f403c
--- /dev/null
+++ b/.github/workflows/config/macos-pkg-choices-freethreaded.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+    <dict>
+        <key>attributeSetting</key>
+        <integer>1</integer>
+        <key>choiceAttribute</key>
+        <string>selected</string>
+        <key>choiceIdentifier</key>
+        <string>org.python.Python.PythonTFramework-{{__VERSION_MAJOR_MINOR__}}</string>
+    </dict>
+</array>
+</plist>
diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml
index d32e23d6..f63d29b6 100644
--- a/.github/workflows/wheel-builder.yml
+++ b/.github/workflows/wheel-builder.yml
@@ -134,15 +134,32 @@ jobs:
         PYTHON:
           - VERSION: '3.11'
             ABI_VERSION: 'cp38'
+            DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg'
+            BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.11/bin/python3'
           - VERSION: '3.11'
             ABI_VERSION: 'cp39'
+            DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg'
+            BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.11/bin/python3'
           - VERSION: '3.13t'
-    name: "Python ${{ matrix.PYTHON.VERSION }} for ABI ${{ matrix.PYTHON.ABI_VERSION }} on macOS"
+            DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg'
+            BIN_PATH: '/Library/Frameworks/PythonT.framework/Versions/3.13/bin/python3.13t'
+    name: "Python ${{ matrix.PYTHON.VERSION }} ${{ matrix.PYTHON.ABI_VERSION }} on macOS"
     steps:
-      - name: Setup python
-        uses: quansight-labs/setup-python@v5.3.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          python-version: ${{ matrix.PYTHON.VERSION }}
+          # The tag to build or the tag received by the tag event
+          ref: ${{ github.event.inputs.version || github.ref }}
+          persist-credentials: false
+      - name: Install Python
+        if: matrix.PYTHON.VERSION != '3.13t'
+        run: |
+          curl "${{ matrix.PYTHON.DOWNLOAD_URL }}" -o python.pkg
+          sudo installer -pkg python.pkg -target /
+      - name: Install Python
+        if: matrix.PYTHON.VERSION == '3.13t'
+        run: |
+          curl "${{ matrix.PYTHON.DOWNLOAD_URL }}" -o python.pkg
+          sudo installer -pkg python.pkg -applyChoiceChangesXML .github/workflows/config/macos-pkg-choices-freethreaded.xml -target /
       - uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203
         with:
           toolchain: stable