Commit9e38af6

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 parents44c2335 +2b8082c commit9e38af6Copy full SHA for 9e38af6

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,9 @@ jobs:`
`127`	`127`	`-os:ubuntu-24.04-arm`
`128`	`128`	`cibw_archs:"aarch64"`
`129`	`129`	`-os:windows-latest`
`130`		`-cibw_archs:"auto64"`
	`130`	`+cibw_archs:"AMD64"`
	`131`	`+ -os:windows-11-arm`
	`132`	`+cibw_archs:"ARM64"`
`131`	`133`	`-os:macos-13`
`132`	`134`	`cibw_archs:"x86_64"`
`133`	`135`	`-os:macos-14`
`@@ -174,6 +176,8 @@ jobs:`
`174`	`176`	`env:`
`175`	`177`	`CIBW_BUILD:"cp310-*"`
`176`	`178`	`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'`
`177`	`181`
`178`	`182`	`-name:Build wheels for PyPy`
`179`	`183`	`uses:pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969# v2.22.0`
`@@ -183,7 +187,7 @@ jobs:`
`183`	`187`	`CIBW_BUILD:"pp310-*"`
`184`	`188`	`CIBW_ARCHS:${{ matrix.cibw_archs }}`
`185`	`189`	`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'`
`187`	`191`
`188`	`192`	`-uses:actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882# v4.4.3`
`189`	`193`	`with:`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,14 @@ local_scheme = "node-and-date"`
`85`	`85`	`parentdir_prefix_version ="matplotlib-"`
`86`	`86`	`fallback_version ="0.0+UNKNOWN"`
`87`	`87`
	`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`	`+`
`88`	`96`	`[tool.isort]`
`89`	`97`	`known_pydata ="numpy, matplotlib.pyplot"`
`90`	`98`	`known_firstparty ="matplotlib,mpl_toolkits"`

Comments

(0)