From 035f1821cdfa2bdb650a297232d044a8ceb6b8a1 Mon Sep 17 00:00:00 2001 From: Tim Felgentreff Date: Sat, 20 Jul 2024 12:53:04 +0200 Subject: [PATCH] Do not use `uv` on GraalPy --- cibuildwheel/linux.py | 6 +++++- cibuildwheel/macos.py | 12 ++++++++---- cibuildwheel/windows.py | 12 ++++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 1974588ca..fca7f00ea 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -191,7 +191,11 @@ def build_in_container( log.build_start(config.identifier) build_options = options.build_options(config.identifier) build_frontend = build_options.build_frontend or BuildFrontendConfig("pip") - use_uv = build_frontend.name == "build[uv]" and Version(config.version) >= Version("3.8") + use_uv = ( + build_frontend == "build[uv]" + and Version(config.version) >= Version("3.8") + and not config.identifier.startswith("gp") + ) pip = ["uv", "pip"] if use_uv else ["pip"] dependency_constraint_flags: list[PathOrStr] = [] diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 78e3902e2..08d2b6501 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -220,8 +220,10 @@ def setup_python( build_frontend = "build" uv_path = find_uv() - use_uv = build_frontend == "build[uv]" and Version(python_configuration.version) >= Version( - "3.8" + use_uv = ( + build_frontend == "build[uv]" + and Version(python_configuration.version) >= Version("3.8") + and not python_configuration.identifier.startswith("gp") ) tmp.mkdir() @@ -433,8 +435,10 @@ def build(options: Options, tmp_path: Path) -> None: for config in python_configurations: build_options = options.build_options(config.identifier) build_frontend = build_options.build_frontend or BuildFrontendConfig("pip") - use_uv = build_frontend.name == "build[uv]" and Version(config.version) >= Version( - "3.8" + use_uv = ( + build_frontend.name == "build[uv]" + and Version(config.version) >= Version("3.8") + and not config.identifier.startswith("gp") ) uv_path = find_uv() if use_uv and uv_path is None: diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 60755e5d0..994797924 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -270,8 +270,10 @@ def setup_python( raise ValueError(msg) assert base_python.exists() - use_uv = build_frontend == "build[uv]" and Version(python_configuration.version) >= Version( - "3.8" + use_uv = ( + build_frontend == "build[uv]" + and Version(python_configuration.version) >= Version("3.8") + and not python_configuration.identifier.startswith("gp") ) uv_path = find_uv() @@ -382,8 +384,10 @@ def build(options: Options, tmp_path: Path) -> None: for config in python_configurations: build_options = options.build_options(config.identifier) build_frontend = build_options.build_frontend or BuildFrontendConfig("pip") - use_uv = build_frontend.name == "build[uv]" and Version(config.version) >= Version( - "3.8" + use_uv = ( + build_frontend == "build[uv]" + and Version(config.version) >= Version("3.8") + and not config.identifier.startswith("gp") ) log.build_start(config.identifier)