From 82c4c460d3ee34c786705cfdf36edf11519ac6c1 Mon Sep 17 00:00:00 2001
From: Philip Cook <cookpa@pennmedicine.upenn.edu>
Date: Mon, 4 Mar 2024 10:25:28 -0500
Subject: [PATCH 1/2] ENH: ARM64 builds
---
.github/workflows/wheels.yml | 57 ++++++++++++++++++++----------------
1 file changed, 31 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 409dabd0..676bb11e 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -67,53 +67,58 @@ jobs:
platform_id: manylinux_x86_64
# macOS on Intel 64-bit
- - os: macos-latest
+ - os: macos-12
python: '3.8'
cibw_python: 38
arch: x86_64
platform_id: macosx_x86_64
- - os: macos-latest
+ - os: macos-12
python: '3.9'
cibw_python: 39
arch: x86_64
platform_id: macosx_x86_64
- - os: macos-latest
+ - os: macos-12
python: '3.10'
cibw_python: 310
arch: x86_64
platform_id: macosx_x86_64
- - os: macos-latest
+ - os: macos-12
python: '3.11'
cibw_python: 311
arch: x86_64
platform_id: macosx_x86_64
- - os: macos-latest
+ - os: macos-12
python: '3.12'
cibw_python: 312
arch: x86_64
platform_id: macosx_x86_64
# macOS on Apple M1 64-bit
- # - os: macos-latest
- # python: '3.8'
- # cibw_python: 38
- # arch: arm64
- # platform_id: macosx_arm64
- # - os: macos-latest
- # python: '3.9'
- # cibw_python: 39
- # arch: arm64
- # platform_id: macosx_arm64
- # - os: macos-latest
- # python: '3.10'
- # cibw_python: 310
- # arch: arm64
- # platform_id: macosx_arm64
- # - os: macos-latest
- # python: '3.11'
- # cibw_python: 311
- # arch: arm64
- # platform_id: macosx_arm64
+ - os: macos-14
+ python: '3.8'
+ cibw_python: 38
+ arch: arm64
+ platform_id: macosx_arm64
+ - os: macos-14
+ python: '3.9'
+ cibw_python: 39
+ arch: arm64
+ platform_id: macosx_arm64
+ - os: macos-14
+ python: '3.10'
+ cibw_python: 310
+ arch: arm64
+ platform_id: macosx_arm64
+ - os: macos-14
+ python: '3.11'
+ cibw_python: 311
+ arch: arm64
+ platform_id: macosx_arm64
+ - os: macos-14
+ python: '3.12'
+ cibw_python: 312
+ arch: arm64
+ platform_id: macosx_arm64
steps:
- uses: actions/checkout@v4
@@ -216,7 +221,7 @@ jobs:
echo $wheeldir
mv $mywhl $wheeldir
rm -r -f $extrawheeldir $wheeldirx
-
+
- name: Publish package
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
if: ${{ (github.event_name == 'push') && (runner.os == 'Linux') }}
From bd887f3d71cfe45ebda7bca6ee52288e5a18db22 Mon Sep 17 00:00:00 2001
From: Philip Cook <cookpa@pennmedicine.upenn.edu>
Date: Mon, 4 Mar 2024 12:12:47 -0500
Subject: [PATCH 2/2] COMP: arm64 builds only for python >= 3.10
---
.github/workflows/wheels.yml | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 676bb11e..9d191a13 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -93,17 +93,7 @@ jobs:
arch: x86_64
platform_id: macosx_x86_64
- # macOS on Apple M1 64-bit
- - os: macos-14
- python: '3.8'
- cibw_python: 38
- arch: arm64
- platform_id: macosx_arm64
- - os: macos-14
- python: '3.9'
- cibw_python: 39
- arch: arm64
- platform_id: macosx_arm64
+ # macOS on Apple M1 64-bit, supported for Python 3.10 and later
- os: macos-14
python: '3.10'
cibw_python: 310