From dd1d08cd8b8f5b2557ade60ab57b35cbc7b16531 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 12 Jul 2024 11:53:28 -0700 Subject: [PATCH] BLD: Enable wheels on Windows-on-ARM --- .github/workflows/cibuildwheel.yml | 7 ++++--- pyproject.toml | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index a05d3ccc330c..bc4728745f7a 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -127,7 +127,9 @@ jobs: - os: ubuntu-24.04-arm cibw_archs: "aarch64" - os: windows-latest - cibw_archs: "auto64" + cibw_archs: "AMD64" + - os: windows-11-arm + cibw_archs: "ARM64" - os: macos-13 cibw_archs: "x86_64" - os: macos-14 @@ -167,7 +169,6 @@ jobs: CIBW_BUILD: "cp311-*" CIBW_ARCHS: ${{ matrix.cibw_archs }} - - name: Build wheels for PyPy uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3 with: @@ -178,7 +179,7 @@ jobs: CIBW_ENABLE: pypy # No wheels available for Pillow with pp311 yet. CIBW_TEST_SKIP: "pp311*" - if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest' + if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest' && matrix.os != 'windows-11-arm' - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: diff --git a/pyproject.toml b/pyproject.toml index 70b078a73d27..1ba5dc64395e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -86,6 +86,13 @@ local_scheme = "node-and-date" parentdir_prefix_version = "matplotlib-" fallback_version = "0.0+UNKNOWN" +[[tool.cibuildwheel.overrides]] +select = "*-win_arm64" +before-test = """\ + pip install --pre \ + --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \ + contourpy numpy""" + [tool.isort] known_pydata = "numpy, matplotlib.pyplot" known_firstparty = "matplotlib,mpl_toolkits"