refactor: address feedback

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

cibuildwheel/platforms/ios.py

@@ -177,8 +177,8 @@ def cross_virtualenv(
     :param build_python: The path to the python binary for the build platform
     :param venv_path: The path where the cross virtual environment should be
         created.
-    :param dependency_constraint_flags: Any flags that should be used when
-        constraining dependencies in the environment.
+    :param dependency_constraint: A path to a constraint file that should be
+        used when constraining dependencies in the environment.
     :param xbuild_tools: A list of executable names (without paths) that are
         on the path, but must be preserved in the cross environment.
     """
@@ -326,8 +326,6 @@ def setup_python(
 
     log.step("Creating cross build environment...")
 
-    dependency_constraint_flags = constraint_flags(dependency_constraint)
-
     venv_path = tmp / "venv"
     env = cross_virtualenv(
         py_version=python_configuration.version,
@@ -352,7 +350,7 @@ def setup_python(
         "install",
         "--upgrade",
         "pip",
-        *dependency_constraint_flags,
+        *constraint_flags(dependency_constraint),
         env=env,
         cwd=venv_path,
     )
@@ -398,7 +396,7 @@ def setup_python(
             "install",
             "--upgrade",
             "build[virtualenv]",
-            *dependency_constraint_flags,
+            *constraint_flags(dependency_constraint),
             env=env,
         )
     else:

cibuildwheel/platforms/macos.py

@@ -219,8 +219,6 @@ def setup_python(
         f"{base_python.name} not found, has {list(base_python.parent.iterdir())}"
     )
 
-    dependency_constraint_flags = constraint_flags(dependency_constraint)
-
     log.step("Setting up build environment...")
     venv_path = tmp / "venv"
     env = virtualenv(
@@ -257,7 +255,7 @@ def setup_python(
             "install",
             "--upgrade",
             "pip",
-            *dependency_constraint_flags,
+            *constraint_flags(dependency_constraint),
             env=env,
             cwd=venv_path,
         )
@@ -352,7 +350,7 @@ def setup_python(
             "install",
             "--upgrade",
             "delocate",
-            *dependency_constraint_flags,
+            *constraint_flags(dependency_constraint),
             env=env,
         )
     elif build_frontend == "build":
@@ -362,7 +360,7 @@ def setup_python(
             "--upgrade",
             "delocate",
             "build[virtualenv]",
-            *dependency_constraint_flags,
+            *constraint_flags(dependency_constraint),
             env=env,
         )
     elif build_frontend == "build[uv]":
@@ -374,7 +372,7 @@ def setup_python(
             "--upgrade",
             "delocate",
             "build[virtualenv, uv]",
-            *dependency_constraint_flags,
+            *constraint_flags(dependency_constraint),
             env=env,
         )
     else:
@@ -428,7 +426,6 @@ def build(options: Options, tmp_path: Path) -> None:
             constraints_path = build_options.dependency_constraints.get_for_python_version(
                 version=config.version, tmp_dir=identifier_tmp_dir
             )
-            dependency_constraint_flags = constraint_flags(constraints_path)
 
             base_python, env = setup_python(
                 identifier_tmp_dir / "build",
@@ -620,7 +617,13 @@ def build(options: Options, tmp_path: Path) -> None:
                     # set up a virtual environment to install and test from, to make sure
                     # there are no dependencies that were pulled in at build time.
                     if not use_uv:
-                        call("pip", "install", "virtualenv", *dependency_constraint_flags, env=env)
+                        call(
+                            "pip",
+                            "install",
+                            "virtualenv",
+                            *constraint_flags(constraints_path),
+                            env=env,
+                        )
 
                     venv_dir = identifier_tmp_dir / f"venv-test-{testing_arch}"
 

cibuildwheel/platforms/pyodide.py

@@ -3,7 +3,7 @@
 import shutil
 import sys
 import tomllib
-from collections.abc import Sequence, Set
+from collections.abc import Set
 from dataclasses import dataclass
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -18,7 +18,6 @@
 from ..logger import log
 from ..options import Options
 from ..selector import BuildSelector
-from ..typing import PathOrStr
 from ..util import resources
 from ..util.cmd import call, shell
 from ..util.file import (
@@ -31,7 +30,7 @@
 )
 from ..util.helpers import prepare_command
 from ..util.packaging import combine_constraints, find_compatible_wheel, get_pip_version
-from ..venv import virtualenv
+from ..venv import constraint_flags, virtualenv
 
 IS_WIN: Final[bool] = sys.platform.startswith("win")
 
@@ -145,7 +144,7 @@ def get_base_python(identifier: str) -> Path:
 def setup_python(
     tmp: Path,
     python_configuration: PythonConfiguration,
-    dependency_constraint_flags: Sequence[PathOrStr],
+    constraints_path: Path | None,
     environment: ParsedEnvironment,
 ) -> dict[str, str]:
     base_python = get_base_python(python_configuration.identifier)
@@ -166,7 +165,7 @@ def setup_python(
         "install",
         "--upgrade",
         "pip",
-        *dependency_constraint_flags,
+        *constraint_flags(constraints_path),
         env=env,
         cwd=venv_path,
     )
@@ -198,7 +197,7 @@ def setup_python(
         "auditwheel-emscripten",
         "build[virtualenv]",
         "pyodide-build",
-        *dependency_constraint_flags,
+        *constraint_flags(constraints_path),
         env=env,
     )
 
@@ -269,14 +268,11 @@ def build(options: Options, tmp_path: Path) -> None:
             constraints_path = build_options.dependency_constraints.get_for_python_version(
                 version=config.version, variant="pyodide", tmp_dir=identifier_tmp_dir
             )
-            dependency_constraint_flags = (
-                ["-c", constraints_path.as_uri()] if constraints_path else []
-            )
 
             env = setup_python(
                 identifier_tmp_dir / "build",
                 config,
-                dependency_constraint_flags,
+                constraints_path,
                 build_options.environment,
             )
             pip_version = get_pip_version(env)

cibuildwheel/platforms/windows.py

@@ -247,7 +247,7 @@ def setup_python(
     if build_frontend == "build[uv]" and not can_use_uv(python_configuration):
         build_frontend = "build"
 
-    use_uv = build_frontend in {"build[uv]", "uv"}
+    use_uv = build_frontend == "build[uv]"
     uv_path = find_uv()
 
     log.step("Setting up build environment...")
@@ -260,8 +260,6 @@ def setup_python(
         use_uv=use_uv,
     )
 
-    dependency_constraint_flags = constraint_flags(dependency_constraint)
-
     # set up environment variables for run_with_env
     env["PYTHON_VERSION"] = python_configuration.version
     env["PYTHON_ARCH"] = python_configuration.arch
@@ -311,7 +309,7 @@ def setup_python(
             "install",
             "--upgrade",
             "build[virtualenv]",
-            *dependency_constraint_flags,
+            *constraint_flags(dependency_constraint),
             env=env,
         )
     elif build_frontend == "build[uv]":
@@ -322,7 +320,7 @@ def setup_python(
             "install",
             "--upgrade",
             "build[virtualenv]",
-            *dependency_constraint_flags,
+            *constraint_flags(dependency_constraint),
             env=env,
         )
 
@@ -371,9 +369,6 @@ def build(options: Options, tmp_path: Path) -> None:
                 version=config.version,
                 tmp_dir=identifier_tmp_dir,
             )
-            dependency_constraint_flags = (
-                ["-c", constraints_path.as_uri()] if constraints_path else []
-            )
 
             # install Python
             base_python, env = setup_python(
@@ -492,7 +487,9 @@ def build(options: Options, tmp_path: Path) -> None:
                 # set up a virtual environment to install and test from, to make sure
                 # there are no dependencies that were pulled in at build time.
                 if not use_uv:
-                    call("pip", "install", "virtualenv", *dependency_constraint_flags, env=env)
+                    call(
+                        "pip", "install", "virtualenv", *constraint_flags(constraints_path), env=env
+                    )
 
                 venv_dir = identifier_tmp_dir / "venv-test"