Skip to content

Commit

Permalink
Update ci-wheels.yml for cibuildwheel v2.16.5
Browse files Browse the repository at this point in the history
Try testing cross-compilation for `macos` `arm64` on `x86_64` , given the latest release of `cibuildwheels` [v2.16.5](https://github.com/pypa/cibuildwheel/releases/tag/v2.16.5)
  • Loading branch information
bjlittle committed Feb 2, 2024
1 parent 46f5af5 commit c34fea1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
version: py311
posargs: "--cov-report=xml --cov"
post-command: codecov
- version: py311
os: macos-latest
- os: macos-latest
version: py311
platform: osx
steps:
- name: "Checkout"
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ci-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ concurrency:
jobs:
build_bdist:
name: "Build ${{ matrix.os }} (${{ matrix.arch }}) wheels"
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
# TBD: extend to support windows
os: ["ubuntu", "macos"]
os: ["ubuntu-latest", "macos-11", "macos-14"]
arch: ["x86_64", "arm64"]
exclude:
- os: ubuntu
Expand All @@ -42,8 +42,7 @@ jobs:
incdir: /usr/include/udunits2
libdir: /usr/lib64
xml_path: /usr/share/udunits/udunits2.xml
- os: macos
incdir: /usr/local/Cellar/udunits/2.2.28/include
- incdir: /usr/local/Cellar/udunits/2.2.28/include
libdir: /usr/local/Cellar/udunits/2.2.28/lib
xml_path: /usr/local/Cellar/udunits/2.2.28/share/udunits/udunits2-common.xml

Expand All @@ -62,7 +61,7 @@ jobs:
CIBW_BEFORE_BUILD_LINUX: yum install -y udunits2-devel
CIBW_BEFORE_BUILD_MACOS: brew install udunits
# https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon
CIBW_TEST_SKIP: "*_arm64"
CIBW_TEST_SKIP: "*-macosx_11_0_arm64"
CIBW_TEST_REQUIRES: pytest
CIBW_TEST_COMMAND: >
python -c 'import cf_units; print(f"cf-units v{cf_units.__version__}")' &&
Expand Down

0 comments on commit c34fea1

Please sign in to comment.