Skip to content

Commit b01dbdd

Browse files
authored
Point release to fix MacOS arm64 wheel builds (#62)
1 parent d743db7 commit b01dbdd

File tree

2 files changed

+61
-19
lines changed

2 files changed

+61
-19
lines changed

.github/workflows/release-wheels.yml

Lines changed: 60 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,23 +131,6 @@ jobs:
131131
python: 312
132132
platform_id: macosx_x86_64
133133

134-
# MacOS arm64
135-
- os: macos-latest
136-
python: 38
137-
platform_id: macosx_arm64
138-
- os: macos-latest
139-
python: 39
140-
platform_id: macosx_arm64
141-
- os: macos-latest
142-
python: 310
143-
platform_id: macosx_arm64
144-
- os: macos-latest
145-
python: 311
146-
platform_id: macosx_arm64
147-
- os: macos-latest
148-
python: 312
149-
platform_id: macosx_arm64
150-
151134
steps:
152135
- uses: actions/checkout@v4
153136
with:
@@ -187,9 +170,68 @@ jobs:
187170
name: wheel-${{ matrix.python }}-${{ matrix.platform_id }}
188171
path: ./dist
189172

173+
build-wheels-macos-arm64:
174+
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
175+
runs-on: ${{ matrix.os }}
176+
strategy:
177+
fail-fast: false
178+
matrix:
179+
include:
180+
# MacOS arm64
181+
- os: macos-latest
182+
python: 38
183+
platform_id: macosx_arm64
184+
- os: macos-latest
185+
python: 39
186+
platform_id: macosx_arm64
187+
- os: macos-latest
188+
python: 310
189+
platform_id: macosx_arm64
190+
- os: macos-latest
191+
python: 311
192+
platform_id: macosx_arm64
193+
- os: macos-latest
194+
python: 312
195+
platform_id: macosx_arm64
196+
197+
steps:
198+
- uses: actions/checkout@v4
199+
with:
200+
submodules: true
201+
202+
- uses: actions/setup-python@v5
203+
name: Install Python
204+
with:
205+
python-version: '3.9'
206+
207+
- name: Install cibuildwheel
208+
run: python -m pip install cibuildwheel==2.16.2 wheel==0.42
209+
210+
- name: Build wheels
211+
env:
212+
CIBW_BUILD: cp${{ matrix.python }}-*
213+
CIBW_ARCHS_MACOS: arm64
214+
CIBW_BUILD_VERBOSITY: 1
215+
run: |
216+
python -m cibuildwheel --output-dir dist
217+
218+
# Cross compiling wheels for arm64 with poetry creates wheels with wrong tag
219+
# Update the wheel with the correct tag then remove the incorrect wheel
220+
- name: Fix poetry mistagging
221+
run: |
222+
wheel tags --platform-tag macosx_12_0_arm64 ./dist/*-macosx_12_0_x86_64.whl
223+
rm ./dist/*-macosx_12_0_x86_64.whl
224+
225+
- name: Store artifacts
226+
uses: actions/upload-artifact@v4
227+
with:
228+
name: wheel-${{ matrix.python }}-${{ matrix.platform_id }}
229+
path: ./dist/*.whl
230+
231+
190232
test-package:
191233
name: Test built package
192-
needs: [ build-wheels, build-sdist ]
234+
needs: [ build-wheels, build-sdist, build-wheels-macos-arm64 ]
193235
runs-on: ubuntu-latest
194236
timeout-minutes: 30
195237
strategy:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ packages = [
5656
{ include = "libjpeg" },
5757
]
5858
readme = "README.md"
59-
version = "2.0.0"
59+
version = "2.0.1"
6060

6161
[tool.poetry.dependencies]
6262
python = "^3.8"

0 commit comments

Comments
 (0)