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

fix: specify full path to non-venv Python (#1881)

Browse Source 
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
This commit is contained in:
Henry Schreiner
2024-06-13 08:18:09 +02:00
committed by GitHub
parent 405a475ac7
commit 70fb1c4a1a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/macos.py
+4 -4
View File
@@ -201,7 +201,7 @@ def setup_python(
dependency_constraint_flags: Sequence[PathOrStr], dependency_constraint_flags: Sequence[PathOrStr],
environment: ParsedEnvironment, environment: ParsedEnvironment,
build_frontend: BuildFrontendName, build_frontend: BuildFrontendName,
) -> dict[str, str]: ) -> tuple[Path, dict[str, str]]:
if build_frontend == "build[uv]" and Version(python_configuration.version) < Version("3.8"): if build_frontend == "build[uv]" and Version(python_configuration.version) < Version("3.8"):
build_frontend = "build" build_frontend = "build"
@@ -388,7 +388,7 @@ def setup_python(
else: else:
assert_never(build_frontend) assert_never(build_frontend)
return env return base_python, env
def build(options: Options, tmp_path: Path) -> None: def build(options: Options, tmp_path: Path) -> None:
@@ -442,7 +442,7 @@ def build(options: Options, tmp_path: Path) -> None:
build_options.dependency_constraints.get_for_python_version(config.version), build_options.dependency_constraints.get_for_python_version(config.version),
] ]
env = setup_python( base_python, env = setup_python(
identifier_tmp_dir / "build", identifier_tmp_dir / "build",
config, config,
dependency_constraint_flags, dependency_constraint_flags,
@@ -658,7 +658,7 @@ def build(options: Options, tmp_path: Path) -> None:
if use_uv: if use_uv:
pip_install = functools.partial(call, *pip, "install", *uv_arch_args) pip_install = functools.partial(call, *pip, "install", *uv_arch_args)
call("uv", "venv", venv_dir, "--python=python", env=env) call("uv", "venv", venv_dir, f"--python={base_python}", env=env)
else: else:
pip_install = functools.partial(call_with_arch, *pip, "install") pip_install = functools.partial(call_with_arch, *pip, "install")
# Use pip version from the initial env to ensure determinism # Use pip version from the initial env to ensure determinism
cibuildwheel/windows.py
+4 -4
View File
@@ -223,7 +223,7 @@ def setup_python(
dependency_constraint_flags: Sequence[PathOrStr], dependency_constraint_flags: Sequence[PathOrStr],
environment: ParsedEnvironment, environment: ParsedEnvironment,
build_frontend: BuildFrontendName, build_frontend: BuildFrontendName,
) -> dict[str, str]: ) -> tuple[Path, dict[str, str]]:
tmp.mkdir() tmp.mkdir()
implementation_id = python_configuration.identifier.split("-")[0] implementation_id = python_configuration.identifier.split("-")[0]
python_libs_base = None python_libs_base = None
@@ -330,7 +330,7 @@ def setup_python(
setup_setuptools_cross_compile(tmp, python_configuration, python_libs_base, env) setup_setuptools_cross_compile(tmp, python_configuration, python_libs_base, env)
setup_rust_cross_compile(tmp, python_configuration, python_libs_base, env) setup_rust_cross_compile(tmp, python_configuration, python_libs_base, env)
return env return base_python, env
def build(options: Options, tmp_path: Path) -> None: def build(options: Options, tmp_path: Path) -> None:
@@ -376,7 +376,7 @@ def build(options: Options, tmp_path: Path) -> None:
] ]
# install Python # install Python
env = setup_python( base_python, env = setup_python(
identifier_tmp_dir / "build", identifier_tmp_dir / "build",
config, config,
dependency_constraint_flags, dependency_constraint_flags,
@@ -502,7 +502,7 @@ def build(options: Options, tmp_path: Path) -> None:
venv_dir = identifier_tmp_dir / "venv-test" venv_dir = identifier_tmp_dir / "venv-test"
if use_uv: if use_uv:
call("uv", "venv", venv_dir, "--python=python", env=env) call("uv", "venv", venv_dir, f"--python={base_python}", env=env)
else: else:
# Use pip version from the initial env to ensure determinism # Use pip version from the initial env to ensure determinism
venv_args = ["--no-periodic-update", f"--pip={pip_version}"] venv_args = ["--no-periodic-update", f"--pip={pip_version}"]