chore: some cleanup and checks (#2792)

* chore: clean up config a bit

* chore: add an extra check

* Apply suggestions from code review

Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>

cibuildwheel/__main__.py

@@ -15,7 +15,6 @@ from tempfile import mkdtemp
 from typing import Any, Literal, TextIO
 
 import cibuildwheel
-import cibuildwheel.util
 from cibuildwheel import errors
 from cibuildwheel.architecture import Architecture, allowed_architectures_check
 from cibuildwheel.ci import CIProvider, detect_ci_provider, fix_ansi_codes_for_github_actions

cibuildwheel/extra.py

@@ -62,7 +62,7 @@ def github_api_request(path: str, *, max_retries: int = 3) -> dict[str, Any]:
             # pylint: disable=E1101
             if (
                 isinstance(e, urllib.error.HTTPError)
-                and (e.code == 403 or e.code == 429)
+                and (e.code in {403, 429})
                 and e.headers.get("x-ratelimit-remaining") == "0"
             ):
                 reset_time = int(e.headers.get("x-ratelimit-reset", 0))

cibuildwheel/platforms/ios.py

@@ -274,7 +274,8 @@ def setup_python(
     build_frontend: BuildFrontendName,
     xbuild_tools: Sequence[str] | None,
 ) -> tuple[Path, dict[str, str]]:
-    if build_frontend == "build[uv]" or build_frontend == "uv":
+    # Not using set because mypy can't narrow it
+    if build_frontend == "build[uv]" or build_frontend == "uv":  # noqa: PLR1714
         msg = "uv doesn't support iOS"
         raise errors.FatalError(msg)
 
@@ -431,7 +432,8 @@ def build(options: Options, tmp_path: Path) -> None:
             build_options = options.build_options(config.identifier)
             build_frontend = build_options.build_frontend
             # uv doesn't support iOS
-            if build_frontend.name == "build[uv]" or build_frontend.name == "uv":
+            # Not using set because mypy can't narrow it
+            if build_frontend.name == "build[uv]" or build_frontend.name == "uv":  # noqa: PLR1714
                 msg = "uv doesn't support iOS"
                 raise errors.FatalError(msg)
 

cibuildwheel/util/packaging.py

@@ -169,10 +169,9 @@ def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> T | None:
             elif platform.startswith("pyodide"):
                 # each Pyodide version has its own platform tag
                 continue
-            else:
-                # Windows should exactly match
-                if tag.platform != platform:
-                    continue
+            # Windows should exactly match
+            elif tag.platform != platform:
+                continue
 
             # If all the filters above pass, then the wheel is a previously built compatible wheel.
             return wheel