add support for building wheels for windows on arm64 (#920)
* add support for building wheels for windows on arm64 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix main_platform_test.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Remove unrequired explicit nuget source * add python arm64 3.9.9 version * extend update_pythons.py to add win/arm64 support * update documentation for new win/arm64 platform * style: include ARM64 in literal * Fix python 3.9 identifier for win_arm64 * Fix table layout issues in README and add note about arm64 pip issue Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
This commit is contained in:
co-authored by
pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Henry Schreiner
parent
59b157f333
commit
594d89f6f7
@@ -29,6 +29,7 @@ class Architecture(Enum):
|
||||
# windows archs
|
||||
x86 = "x86"
|
||||
AMD64 = "AMD64"
|
||||
ARM64 = "ARM64"
|
||||
|
||||
# Allow this to be sorted
|
||||
def __lt__(self, other: "Architecture") -> bool:
|
||||
@@ -83,7 +84,7 @@ class Architecture(Enum):
|
||||
elif platform == "macos":
|
||||
return {Architecture.x86_64, Architecture.arm64, Architecture.universal2}
|
||||
elif platform == "windows":
|
||||
return {Architecture.x86, Architecture.AMD64}
|
||||
return {Architecture.x86, Architecture.AMD64, Architecture.ARM64}
|
||||
else:
|
||||
assert_never(platform)
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ PLATFORM_IDENTIFIER_DESCIPTIONS = {
|
||||
"musllinux_s390x": "manylinux s390x",
|
||||
"win32": "Windows 32bit",
|
||||
"win_amd64": "Windows 64bit",
|
||||
"win_arm64": "Windows on ARM 64bit",
|
||||
"macosx_x86_64": "macOS x86_64",
|
||||
"macosx_universal2": "macOS Universal 2 - x86_64 and arm64",
|
||||
"macosx_arm64": "macOS arm64 - Apple Silicon",
|
||||
|
||||
@@ -87,6 +87,8 @@ python_configurations = [
|
||||
{ identifier = "cp39-win_amd64", version = "3.9.8", arch = "64" },
|
||||
{ identifier = "cp310-win32", version = "3.10.0", arch = "32" },
|
||||
{ identifier = "cp310-win_amd64", version = "3.10.0", arch = "64" },
|
||||
{ identifier = "cp39-win_arm64", version = "3.9.9", arch = "ARM64" },
|
||||
{ identifier = "cp310-win_arm64", version = "3.10.0", arch = "ARM64" },
|
||||
{ identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" },
|
||||
{ identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.7-win64.zip" },
|
||||
]
|
||||
|
||||
+28
-7
@@ -7,6 +7,8 @@ from pathlib import Path
|
||||
from typing import Dict, List, NamedTuple, Optional, Sequence, Set
|
||||
from zipfile import ZipFile
|
||||
|
||||
from packaging.version import Version
|
||||
|
||||
from .architecture import Architecture
|
||||
from .environment import ParsedEnvironment
|
||||
from .logger import log
|
||||
@@ -43,9 +45,8 @@ def shell(
|
||||
|
||||
|
||||
def get_nuget_args(version: str, arch: str) -> List[str]:
|
||||
python_name = "python"
|
||||
if arch == "32":
|
||||
python_name += "x86"
|
||||
platform_suffix = {"32": "x86", "64": "", "ARM64": "arm64"}
|
||||
python_name = "python" + platform_suffix[arch]
|
||||
return [
|
||||
python_name,
|
||||
"-Version",
|
||||
@@ -73,10 +74,7 @@ def get_python_configurations(
|
||||
|
||||
python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
|
||||
|
||||
map_arch = {
|
||||
"32": Architecture.x86,
|
||||
"64": Architecture.AMD64,
|
||||
}
|
||||
map_arch = {"32": Architecture.x86, "64": Architecture.AMD64, "ARM64": Architecture.ARM64}
|
||||
|
||||
# skip builds as required
|
||||
python_configurations = [
|
||||
@@ -189,10 +187,33 @@ def setup_python(
|
||||
# Install pip
|
||||
|
||||
requires_reinstall = not (installation_path / "Scripts" / "pip.exe").exists()
|
||||
|
||||
if requires_reinstall:
|
||||
# maybe pip isn't installed at all. ensurepip resolves that.
|
||||
call(["python", "-m", "ensurepip"], env=env, cwd=CIBW_INSTALL_PATH)
|
||||
|
||||
# pip older than 21.3 builds executables such as pip.exe for x64 platform.
|
||||
# The first re-install of pip updates pip module but builds pip.exe using
|
||||
# the old pip which still generates x64 executable. But the second
|
||||
# re-install uses updated pip and correctly builds pip.exe for the target.
|
||||
# This can be removed once ARM64 Pythons (currently 3.9 and 3.10) bundle
|
||||
# pip versions newer than 21.3.
|
||||
if python_configuration.arch == "ARM64" and Version(get_pip_version(env)) < Version("21.3"):
|
||||
call(
|
||||
[
|
||||
"python",
|
||||
"-m",
|
||||
"pip",
|
||||
"install",
|
||||
"--force-reinstall",
|
||||
"--upgrade",
|
||||
"pip",
|
||||
*dependency_constraint_flags,
|
||||
],
|
||||
env=env,
|
||||
cwd=CIBW_INSTALL_PATH,
|
||||
)
|
||||
|
||||
# upgrade pip to the version matching our constraints
|
||||
# if necessary, reinstall it to ensure that it's available on PATH as 'pip.exe'
|
||||
call(
|
||||
|
||||
Reference in New Issue
Block a user