diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 706aed3..1386e08 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -9,16 +9,15 @@ jobs: strategy: matrix: # macos-13 was an intel runner, macos-14 is apple silicon - os: [ubuntu-22.04, windows-2022, macos-14] + os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2022, windows-11-arm, macos-14] env: # Seems to have trouble parsing our setup.py, thus: CIBW_PROJECT_REQUIRES_PYTHON: ">=3.10" # Install numpy with a wheel (do NOT compile it): CIBW_BEFORE_BUILD: "pip install --only-binary :all: -r requirements.txt" - # There are/were no numpy wheels for these: - CIBW_SKIP: cp3*-manylinux_i686 *-musllinux_* - # configure cibuildwheel to build native arch & aarch64 too - CIBW_ARCHS_LINUX: auto aarch64 + # There are/were no numpy wheels for these. + # Windows ARM64 CPython is only available from 3.11 onwards. + CIBW_SKIP: cp3*-manylinux_i686 *-musllinux_* cp310-win_arm64 # Quick test with C code using NumPy C API: CIBW_TEST_COMMAND: "python {package}/Tests/test_Cluster.py" @@ -28,12 +27,6 @@ jobs: fetch-depth: 0 # Optional submodules: true # Optional, use if you have submodules - - name: Set up QEMU - if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v4 - with: - platforms: all - - name: Checkout tag/commit run: | git submodule update --init biopython diff --git a/requirements.txt b/requirements.txt index 1f6e134..40d5ea8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,6 @@ numpy==1.14.5; python_version=='3.7' numpy==1.17.3; python_version=='3.8' numpy==1.21.0; python_version=='3.9' numpy==1.22.3; python_version=='3.10' -numpy==1.23.3; python_version=='3.11' -numpy==1.26.1; python_version=='3.12' +# NumPy only has win_arm64 wheels from 2.3.0 onwards +numpy==1.23.3; python_version=='3.11' and (sys_platform!='win32' or platform_machine!='ARM64') +numpy==1.26.1; python_version=='3.12' and (sys_platform!='win32' or platform_machine!='ARM64')