optimise unit tests - a specific platform module API for all configs

Unit test time: 26.2s -> 13.1s

Author: joerick

cibuildwheel/__main__.py

@@ -448,20 +448,36 @@ def detect_warnings(*, options: Options, identifiers: Iterable[str]) -> list[str
     build_selector = options.globals.build_selector
     test_selector = options.globals.test_selector
 
+    all_valid_identifiers = [
+        config.identifier
+        for module in ALL_PLATFORM_MODULES.values()
+        for config in module.all_python_configurations()
+    ]
+
+    enabled_selector = BuildSelector(
+        build_config="*", skip_config="", enable=options.globals.build_selector.enable
+    )
+    all_enabled_identifiers = [
+        identifier for identifier in all_valid_identifiers if enabled_selector(identifier)
+    ]
+
     warnings += check_for_invalid_selectors(
         selector_name="build",
         selector_value=build_selector.build_config,
-        enable=options.globals.build_selector.enable,
+        all_valid_identifiers=all_valid_identifiers,
+        all_enabled_identifiers=all_enabled_identifiers,
     )
     warnings += check_for_invalid_selectors(
         selector_name="skip",
         selector_value=build_selector.skip_config,
-        enable=options.globals.build_selector.enable,
+        all_valid_identifiers=all_valid_identifiers,
+        all_enabled_identifiers=all_enabled_identifiers,
     )
     warnings += check_for_invalid_selectors(
         selector_name="test_skip",
         selector_value=test_selector.skip_config,
-        enable=options.globals.build_selector.enable,
+        all_valid_identifiers=all_valid_identifiers,
+        all_enabled_identifiers=all_enabled_identifiers,
     )
 
     return warnings
@@ -471,32 +487,11 @@ def check_for_invalid_selectors(
     *,
     selector_name: Literal["build", "skip", "test_skip"],
     selector_value: str,
-    enable: frozenset[EnableGroup],
+    all_valid_identifiers: Sequence[str],
+    all_enabled_identifiers: Sequence[str],
 ) -> list[str]:
     warnings = []
 
-    all_enabled_identifiers = [
-        identifier
-        for name, module in ALL_PLATFORM_MODULES.items()
-        for identifier in get_build_identifiers(
-            platform_module=module,
-            architectures=Architecture.all_archs(name),
-            build_selector=BuildSelector(build_config="*", skip_config="", enable=enable),
-        )
-    ]
-
-    all_valid_identifiers = [
-        identifier
-        for name, module in ALL_PLATFORM_MODULES.items()
-        for identifier in get_build_identifiers(
-            platform_module=module,
-            architectures=Architecture.all_archs(name),
-            build_selector=BuildSelector(
-                build_config="*", skip_config="", enable=EnableGroup.all_groups()
-            ),
-        )
-    ]
-
     for selector in selector_value.split():
         if not any(selector_matches(selector, i) for i in all_enabled_identifiers):
             msg = f"Invalid {selector_name} selector: {selector!r}. "

cibuildwheel/platforms/__init__.py

@@ -14,6 +14,8 @@
 class PlatformModule(Protocol):
     # note that as per PEP544, the self argument is ignored when the protocol
     # is applied to a module
+    def all_python_configurations(self) -> Sequence[GenericPythonConfiguration]: ...
+
     def get_python_configurations(
         self, build_selector: BuildSelector, architectures: set[Architecture]
     ) -> Sequence[GenericPythonConfiguration]: ...

cibuildwheel/platforms/linux.py

@@ -54,13 +54,16 @@ class BuildStep:
     container_image: str
 
 
+def all_python_configurations() -> list[PythonConfiguration]:
+    config_dicts = resources.read_python_configs("linux")
+    return [PythonConfiguration(**item) for item in config_dicts]
+
+
 def get_python_configurations(
     build_selector: BuildSelector,
     architectures: Set[Architecture],
 ) -> list[PythonConfiguration]:
-    full_python_configs = resources.read_python_configs("linux")
-
-    python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
+    python_configurations = all_python_configurations()
 
     # return all configurations whose arch is in our `architectures` set,
     # and match the build/skip rules

cibuildwheel/platforms/macos.py

@@ -86,12 +86,15 @@ class PythonConfiguration:
     url: str
 
 
+def all_python_configurations() -> list[PythonConfiguration]:
+    config_dicts = resources.read_python_configs("macos")
+    return [PythonConfiguration(**item) for item in config_dicts]
+
+
 def get_python_configurations(
     build_selector: BuildSelector, architectures: Set[Architecture]
 ) -> list[PythonConfiguration]:
-    full_python_configs = resources.read_python_configs("macos")
-
-    python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
+    python_configurations = all_python_configurations()
 
     # filter out configs that don't match any of the selected architectures
     python_configurations = [

cibuildwheel/platforms/pyodide.py

@@ -217,15 +217,16 @@ def setup_python(
     return env
 
 
+def all_python_configurations() -> list[PythonConfiguration]:
+    full_python_configs = resources.read_python_configs("pyodide")
+    return [PythonConfiguration(**item) for item in full_python_configs]
+
+
 def get_python_configurations(
     build_selector: BuildSelector,
     architectures: Set[Architecture],  # noqa: ARG001
 ) -> list[PythonConfiguration]:
-    full_python_configs = resources.read_python_configs("pyodide")
-
-    python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
-    python_configurations = [c for c in python_configurations if build_selector(c.identifier)]
-    return python_configurations
+    return [c for c in all_python_configurations() if build_selector(c.identifier)]
 
 
 def build(options: Options, tmp_path: Path) -> None:

cibuildwheel/platforms/windows.py

@@ -62,13 +62,16 @@ class PythonConfiguration:
     url: str | None = None
 
 
+def all_python_configurations() -> list[PythonConfiguration]:
+    config_dicts = resources.read_python_configs("windows")
+    return [PythonConfiguration(**item) for item in config_dicts]
+
+
 def get_python_configurations(
     build_selector: BuildSelector,
     architectures: Set[Architecture],
 ) -> list[PythonConfiguration]:
-    full_python_configs = resources.read_python_configs("windows")
-
-    python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
+    python_configurations = all_python_configurations()
 
     map_arch = {"32": Architecture.x86, "64": Architecture.AMD64, "ARM64": Architecture.ARM64}