fix: pull out windows workaround

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

Author: henryiii

cibuildwheel/macos.py

@@ -31,6 +31,7 @@
     BuildSelector,
     NonPlatformWheelError,
     call,
+    combine_constraints,
     detect_ci_provider,
     download,
     find_compatible_wheel,
@@ -432,11 +433,8 @@ def build(options: Options, tmp_path: Path) -> None:
                     constraint_path = build_options.dependency_constraints.get_for_python_version(
                         config.version
                     )
-                    pip_constraint = "UV_CONSTRAINT" if use_uv else "PIP_CONSTRAINT"
-                    user_constraints = build_env.get(pip_constraint)
-                    our_constraints = str(constraint_path) if use_uv else constraint_path.as_uri()
-                    build_env[pip_constraint] = " ".join(
-                        c for c in [user_constraints, our_constraints] if c
+                    combine_constraints(
+                        build_env, constraint_path, identifier_tmp_dir if use_uv else None
                     )
 
                 if build_frontend.name == "pip":

cibuildwheel/util.py

@@ -16,7 +16,7 @@
 import typing
 import urllib.request
 from collections import defaultdict
-from collections.abc import Generator, Iterable, Mapping, Sequence
+from collections.abc import Generator, Iterable, Mapping, MutableMapping, Sequence
 from dataclasses import dataclass
 from enum import Enum
 from functools import cached_property, lru_cache
@@ -44,6 +44,7 @@
     "cached_property",
     "call",
     "chdir",
+    "combine_constraints",
     "find_compatible_wheel",
     "find_uv",
     "format_safe",
@@ -866,9 +867,37 @@ def parse_key_value_string(
 def find_uv() -> Path | None:
     # Prefer uv in our environment
     with contextlib.suppress(ImportError, FileNotFoundError):
+        # pylint: disable-next=import-outside-toplevel
         from uv import find_uv_bin
 
         return Path(find_uv_bin())
 
     uv_on_path = shutil.which("uv")
     return Path(uv_on_path) if uv_on_path else None
+
+
+def combine_constraints(
+    env: MutableMapping[str, str], /, constraints_path: Path, tmp_dir: Path | None
+) -> None:
+    """
+    This will workaround a bug in pip<=21.1.1 or uv<=0.2.0 if a tmp_dir is given.
+    If set to None, this will use the modern URI method.
+    """
+
+    if tmp_dir:
+        if " " in str(constraints_path):
+            assert " " not in str(tmp_dir)
+            tmp_file = tmp_dir / "constraints.txt"
+            tmp_file.write_bytes(constraints_path.read_bytes())
+            constraints_path = tmp_file
+        our_constraints = str(constraints_path)
+    else:
+        our_constraints = (
+            constraints_path.as_uri() if " " in str(constraints_path) else str(constraints_path)
+        )
+
+    user_constraints = env.get("PIP_CONSTRAINT")
+
+    env["UV_CONSTRAINT"] = env["PIP_CONSTRAINT"] = " ".join(
+        c for c in [our_constraints, user_constraints] if c
+    )

cibuildwheel/windows.py

@@ -29,6 +29,7 @@
     BuildSelector,
     NonPlatformWheelError,
     call,
+    combine_constraints,
     download,
     extract_zip,
     find_compatible_wheel,
@@ -425,22 +426,7 @@ def build(options: Options, tmp_path: Path) -> None:
                     constraints_path = build_options.dependency_constraints.get_for_python_version(
                         config.version
                     )
-                    # Bug in pip <= 21.1.3 - we can't have a space in the
-                    # constraints file, and pip doesn't support drive letters
-                    # in uhi.  After probably pip 21.2, we can use uri. For
-                    # now, use a temporary file.
-                    if " " in str(constraints_path):
-                        assert " " not in str(identifier_tmp_dir)
-                        tmp_file = identifier_tmp_dir / "constraints.txt"
-                        tmp_file.write_bytes(constraints_path.read_bytes())
-                        constraints_path = tmp_file
-
-                    our_constraints = str(constraints_path)
-                    user_constraints = build_env.get("PIP_CONSTRAINT")
-                    build_env["PIP_CONSTRAINT"] = " ".join(
-                        c for c in [our_constraints, user_constraints] if c
-                    )
-                    build_env["UV_CONSTRAINT"] = build_env["PIP_CONSTRAINT"]
+                    combine_constraints(build_env, constraints_path, identifier_tmp_dir)
 
                 if build_frontend.name == "pip":
                     extra_flags += get_build_verbosity_extra_flags(build_options.build_verbosity)

pyproject.toml

@@ -177,6 +177,7 @@ messages_control.disable = [
   "wrong-import-position",
   "unused-argument",  # Handled by Ruff
   "broad-exception-raised",  # Could be improved eventually
+  "consider-using-in",  # MyPy can't narrow "in"
 ]
 
 [tool.ruff]