fix: apply base constraints to build env

bin/generate_pyodide_constraints.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
+import inspect
 import sys
-import textwrap
 from pathlib import Path
 
 import click
@@ -51,7 +51,7 @@ def generate_pyodide_constraints(pyodide_version: str, output_file: str | None =
 
     pyodide_build_specifier = ",".join(pyodide_build_specifier_parts)
 
-    constraints_txt = textwrap.dedent(f"""
+    constraints_txt = inspect.cleandoc(f"""
         pip
         build[virtualenv]
         pyodide-build{pyodide_build_specifier}

cibuildwheel/resources/constraints-pyodide312.in

@@ -0,0 +1,5 @@
+
+pip
+build[virtualenv]
+pyodide-build>=0.26.0
+click<8.2

cibuildwheel/resources/constraints-pyodide313.in

@@ -0,0 +1,5 @@
+
+pip
+build[virtualenv]
+pyodide-build>=0.26.0
+click<8.2

cibuildwheel/util/packaging.py

@@ -4,6 +4,7 @@
 from pathlib import Path, PurePath
 from typing import Any, Literal, Self, TypeVar
 
+import packaging.requirements
 from packaging.utils import parse_wheel_filename
 
 from . import resources
@@ -80,8 +81,23 @@ def get_for_python_version(
         self, *, version: str, variant: Literal["python", "pyodide"] = "python", tmp_dir: Path
     ) -> Path | None:
         if self.packages:
+            file_name = (
+                resources.PATH / f"constraints-pyodide{version}.in"
+                if variant == "pyodide"
+                else resources.CONSTRAINTS_IN
+            )
+            input_packages = (
+                s.strip() for s in file_name.joinpath(file_name).read_text().splitlines()
+            )
+            input_requirements = (
+                packaging.requirements.Requirement(s)
+                for s in input_packages
+                if s and not s.startswith("#")
+            )
+            packages = [*self.packages, *(str(r) for r in input_requirements if r.specifier)]
+
             constraint_file = tmp_dir / "constraints.txt"
-            constraint_file.write_text("\n".join(self.packages))
+            constraint_file.write_text("\n".join(packages))
             return constraint_file
 
         if self.base_file_path is not None:

cibuildwheel/util/resources.py

@@ -14,6 +14,7 @@
 PINNED_DOCKER_IMAGES: Final[Path] = PATH / "pinned_docker_images.cfg"
 BUILD_PLATFORMS: Final[Path] = PATH / "build-platforms.toml"
 CONSTRAINTS: Final[Path] = PATH / "constraints.txt"
+CONSTRAINTS_IN: Final[Path] = PATH / "constraints.in"
 VIRTUALENV: Final[Path] = PATH / "virtualenv.toml"
 CIBUILDWHEEL_SCHEMA: Final[Path] = PATH / "cibuildwheel.schema.json"
 PYTHON_BUILD_STANDALONE_RELEASES: Final[Path] = PATH / "python-build-standalone-releases.json"

noxfile.py

@@ -105,13 +105,13 @@ def update_constraints(session: nox.Session) -> None:
         python_version = ".".join(pyodide["version"].split(".")[:2])
         pyodide_version = pyodide["default_pyodide_version"]
 
-        tmp_file = Path(session.create_tmp()) / "constraints-pyodide.in"
+        in_file = resources / f"constraints-pyodide{python_version.replace('.', '')}.in"
 
         session.run(
             "python",
             "bin/generate_pyodide_constraints.py",
             "--output-file",
-            tmp_file,
+            in_file,
             pyodide_version,
         )
 
@@ -122,7 +122,7 @@ def update_constraints(session: nox.Session) -> None:
             "compile",
             f"--python-version={python_version}",
             "--upgrade",
-            tmp_file,
+            in_file,
             f"--output-file={output_file}",
             env=env,
         )