Skip to content

Commit

Permalink
[python/ci] Bump up cibuildwheel version, use macos-14, and use `MACO…
Browse files Browse the repository at this point in the history
…SX_DEPLOYMENT_TARGET` (#2641)

* Bump up cibuildwheel version and use macos-14

* Set MACOSX_DEPLOYMENT_TARGET

* Enable macos-arm in smoke-tests

* Update python-packaging.yml
  • Loading branch information
dudoslav authored May 24, 2024
1 parent 670267f commit 7d907b2
Showing 1 changed file with 10 additions and 17 deletions.
27 changes: 10 additions & 17 deletions .github/workflows/python-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ jobs:
cibw_archs_macos: x86_64
wheel-name: macos-x86_64
- build: macosx_arm64
os: macos-12
os: macos-14
# ^ Note that macos-14 is arm64 only
cibw_archs_macos: arm64
wheel-name: macos-arm64
steps:
Expand All @@ -69,7 +70,7 @@ jobs:
- name: Rename sdist
run: cp tiledbsoma-*.tar.gz tiledbsoma.tar.gz && ls -lh
- name: Build wheels
uses: pypa/cibuildwheel@v2.11.3
uses: pypa/cibuildwheel@v2.18.1
with:
package-dir: tiledbsoma.tar.gz
only: cp${{ matrix.python-version }}-${{ matrix.build }}
Expand All @@ -84,6 +85,7 @@ jobs:
CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }}
CIBW_TEST_SKIP: "*_arm64"
CMAKE_OSX_ARCHITECTURES: ${{ matrix.cibw_archs_macos }}
MACOSX_DEPLOYMENT_TARGET: "11.0"
- name: Upload wheel-${{ matrix.wheel-name }}-${{ matrix.python-version }} to GitHub Actions storage
uses: actions/upload-artifact@v4
with:
Expand All @@ -105,7 +107,7 @@ jobs:
wheel-name:
- manylinux2014
- macos-x86_64
# - macos-arm64
- macos-arm64
include:
- wheel-name: manylinux2014
os: ubuntu-20.04
Expand All @@ -117,20 +119,11 @@ jobs:
arch: x86_64
cc: clang
cxx: clang++
# TODO: As of 2023-05-18 all we can do in GitHub Actions for MacOS arm64 is cross-compile the wheels
# for arm64, while actually running on x86 hardware. This means we can build the wheels but we cannot
# smoke-test them. This is pending MacOS arm64 runners for GitHub Actions which is tracked here:
# https://github.com/github/roadmap/issues/528
# Any smoke-testing for arm64 wheels needs to be done manually by:
# * Download the whatever.zip file from GitHub Actions -> our instance -> Artifacts
# * unzip whatever.zip
# * pip install tiledbsoma-i.j.k-cp310-cp310-macosx_11_0_arm64.whl
#
# - wheel-name: macos-arm64
# os: macos-12
# arch: arm64
# cc: clang
# cxx: clang++
- wheel-name: macos-arm64
os: macos-14
arch: arm64
cc: clang
cxx: clang++
fail-fast: false
steps:
- name: Set up Python ${{ matrix.python.vv }}
Expand Down

0 comments on commit 7d907b2

Please sign in to comment.