Skip to content

merge queue: embarking main (52d3b8d) and #2355 together #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: embarking main (52d3b8d) and #2355 together #2356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdb6e5c
Fix OSX wheels
benjeffery Apr 30, 2025
50642c4
Merge of #2355
mergify[bot] Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ on:

jobs:
OSX:
runs-on: macos-latest
name: Build ${{ matrix.os }} - ${{ matrix.python }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-13, macos-15]
python: [3.9, "3.10", 3.11, 3.12]
steps:
- name: Checkout
Expand All @@ -29,13 +31,21 @@ jobs:
run: |
brew install gsl
pip install --upgrade pip build
- name: Build Wheel
- name: Build Wheel (arm64)
if: matrix.os == 'macos-15'
run: |
export PLAT="arm64"
export _PYTHON_HOST_PLATFORM="macosx-11.0-arm64"
export OLDARCHFLAGS=$ARCHFLAGS
export ARCHFLAGS+="-arch arm64"
export CFLAGS+=" -arch arm64"
export CXXFLAGS+=" -arch arm64"
export ARCHFLAGS=$OLDARCHFLAGS
export ARCHFLAGS+=" -arch arm64"
export CPPFLAGS+=" -arch arm64"
export LDFLAGS+=" -arch arm64"
python -m build --wheel
- name: Build Wheel (x86_64)
if: matrix.os == 'macos-13'
run: |
export PLAT="x86_64"
export _PYTHON_HOST_PLATFORM="macosx-11.0-x86_64"
export CFLAGS+=" -arch x86_64"
Expand All @@ -48,12 +58,11 @@ jobs:
- name: Delocate to bundle dynamic libs
run: |
pip install delocate
delocate-wheel -v dist/msprime-*arm64.whl
delocate-wheel -v dist/msprime-*x86_64.whl
delocate-wheel -v dist/*.whl
- name: Upload Wheels
uses: actions/upload-artifact@v4.6.1
with:
name: osx-wheel-${{ matrix.python }}
name: osx-wheel-${{ matrix.os }}-${{ matrix.python }}
path: dist

manylinux:
Expand Down Expand Up @@ -89,16 +98,18 @@ jobs:
path: dist/wheelhouse

OSX-test:
name: Test ${{ matrix.os }} - ${{ matrix.python }}
needs: ['OSX']
runs-on: macos-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-13, macos-15]
python: [3.9, "3.10", 3.11, 3.12]
steps:
- name: Download wheels
uses: actions/download-artifact@v4.2.0
with:
name: osx-wheel-${{ matrix.python }}
name: osx-wheel-${{ matrix.os }}-${{ matrix.python }}
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5.4.0
with:
Expand Down
Loading