Skip to content

Commit 9e38af6

Browse files
authored
Merge pull request #30352 from meeseeksmachine/auto-backport-of-pr-28554-on-v3.10.x
Backport PR #28554 on branch v3.10.x (BLD: Enable wheels on Windows-on-ARM)
2 parents 44c2335 + 2b8082c commit 9e38af6

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.github/workflows/cibuildwheel.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ jobs:
127127
- os: ubuntu-24.04-arm
128128
cibw_archs: "aarch64"
129129
- os: windows-latest
130-
cibw_archs: "auto64"
130+
cibw_archs: "AMD64"
131+
- os: windows-11-arm
132+
cibw_archs: "ARM64"
131133
- os: macos-13
132134
cibw_archs: "x86_64"
133135
- os: macos-14
@@ -174,6 +176,8 @@ jobs:
174176
env:
175177
CIBW_BUILD: "cp310-*"
176178
CIBW_ARCHS: ${{ matrix.cibw_archs }}
179+
# Ignore because dependencies do not provide win-arm wheels on 3.10; should be removed on merge up
180+
if: matrix.os != 'windows-11-arm'
177181

178182
- name: Build wheels for PyPy
179183
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
@@ -183,7 +187,7 @@ jobs:
183187
CIBW_BUILD: "pp310-*"
184188
CIBW_ARCHS: ${{ matrix.cibw_archs }}
185189
CIBW_ENABLE: pypy
186-
if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
190+
if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest' && matrix.os != 'windows-11-arm'
187191

188192
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
189193
with:

pyproject.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ local_scheme = "node-and-date"
8585
parentdir_prefix_version = "matplotlib-"
8686
fallback_version = "0.0+UNKNOWN"
8787

88+
# FIXME: Remove this override once dependencies are available on PyPI.
89+
[[tool.cibuildwheel.overrides]]
90+
select = "*-win_arm64"
91+
before-test = """\
92+
pip install --pre \
93+
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
94+
contourpy numpy"""
95+
8896
[tool.isort]
8997
known_pydata = "numpy, matplotlib.pyplot"
9098
known_firstparty = "matplotlib,mpl_toolkits"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy