Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: pass a PythonConfiguration to install_cpython

Browse Source
This commit is contained in:
mayeut
2024-05-20 07:12:10 -04:00
committed by Henry Schreiner
parent 3992d5719c
commit b61324914b
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/windows.py
+8 -11
View File
@@ -110,7 +110,11 @@ def _ensure_nuget() -> Path:
return nuget return nuget
def install_cpython(version: str, arch: str, free_threaded: bool) -> Path: def install_cpython(configuration: PythonConfiguration, arch: str | None = None) -> Path:
version = configuration.version
free_threaded = "t-" in configuration.identifier
if arch is None:
arch = configuration.arch
base_output_dir = CIBW_CACHE_PATH / "nuget-cpython" base_output_dir = CIBW_CACHE_PATH / "nuget-cpython"
nuget_args = get_nuget_args(version, arch, free_threaded, base_output_dir) nuget_args = get_nuget_args(version, arch, free_threaded, base_output_dir)
installation_path = base_output_dir / (nuget_args[0] + "." + version) / "tools" installation_path = base_output_dir / (nuget_args[0] + "." + version) / "tools"
@@ -229,21 +233,14 @@ def setup_python(
log.step(f"Installing Python {implementation_id}...") log.step(f"Installing Python {implementation_id}...")
if implementation_id.startswith("cp"): if implementation_id.startswith("cp"):
native_arch = platform_module.machine() native_arch = platform_module.machine()
free_threaded = implementation_id.endswith("t") base_python = install_cpython(python_configuration)
if python_configuration.arch == "ARM64" != native_arch: if python_configuration.arch == "ARM64" != native_arch:
# To cross-compile for ARM64, we need a native CPython to run the # To cross-compile for ARM64, we need a native CPython to run the
# build, and a copy of the ARM64 import libraries ('.\libs\*.lib') # build, and a copy of the ARM64 import libraries ('.\libs\*.lib')
# for any extension modules. # for any extension modules.
python_libs_base = install_cpython( python_libs_base = base_python.parent / "libs"
python_configuration.version, python_configuration.arch, free_threaded
)
python_libs_base = python_libs_base.parent / "libs"
log.step(f"Installing native Python {native_arch} for cross-compilation...") log.step(f"Installing native Python {native_arch} for cross-compilation...")
base_python = install_cpython(python_configuration.version, native_arch, free_threaded) base_python = install_cpython(python_configuration, arch=native_arch)
else:
base_python = install_cpython(
python_configuration.version, python_configuration.arch, free_threaded
)
elif implementation_id.startswith("pp"): elif implementation_id.startswith("pp"):
assert python_configuration.url is not None assert python_configuration.url is not None
base_python = install_pypy(tmp, python_configuration.arch, python_configuration.url) base_python = install_pypy(tmp, python_configuration.arch, python_configuration.url)