fix: include Requires-Python info in printout (#1017)

.pre-commit-config.yaml

@@ -51,8 +51,9 @@ repos:
   rev: v0.931
   hooks:
   - id: mypy
+    name: mypy 3.6 on cibuildwheel/
     exclude: ^(bin|cibuildwheel/resources|docs)/.*py$
-    args: ["--python-version=3.6", "--scripts-are-modules", "--show-error-codes"]
+    args: ["--python-version=3.6", "--show-error-codes"]
     additional_dependencies: &mypy-dependencies
       - nox
       - packaging>=21.0
@@ -66,10 +67,15 @@ repos:
       - types-pyyaml
       - types-requests
       - bracex
+      - dataclasses
   - id: mypy
     name: mypy 3.7+ on bin/
     files: ^((bin|docs)/.*py)$
-    args: ["--python-version=3.7", "--scripts-are-modules", "--show-error-codes"]
+    args: ["--python-version=3.7", "--show-error-codes"]
+    additional_dependencies: *mypy-dependencies
+  - id: mypy
+    name: mypy 3.10
+    args: ["--python-version=3.10", "--show-error-codes"]
     additional_dependencies: *mypy-dependencies
 
 - repo: https://github.com/asottile/yesqa

cibuildwheel/util.py

@@ -1,4 +1,5 @@
 import contextlib
+import dataclasses
 import fnmatch
 import itertools
 import os
@@ -16,6 +17,7 @@ from pathlib import Path
 from time import sleep
 from typing import (
     Any,
+    ClassVar,
     Dict,
     Iterable,
     Iterator,
@@ -205,6 +207,8 @@ def selector_matches(patterns: str, string: str) -> bool:
     return any(fnmatch.fnmatch(string, pat) for pat in expanded_patterns)
 
 
+# Once we require Python 3.10+, we can add kw_only=True
+@dataclasses.dataclass
 class IdentifierSelector:
     """
     This class holds a set of build/skip patterns. You call an instance with a
@@ -215,20 +219,12 @@ class IdentifierSelector:
     """
 
     # a pattern that skips prerelease versions, when include_prereleases is False.
-    PRERELEASE_SKIP = ""
+    PRERELEASE_SKIP: ClassVar[str] = ""
 
-    def __init__(
+    skip_config: str
-        self,
+    build_config: str
-        *,
+    requires_python: Optional[SpecifierSet] = None
-        build_config: str,
+    prerelease_pythons: bool = False
-        skip_config: str,
-        requires_python: Optional[SpecifierSet] = None,
-        prerelease_pythons: bool = False,
-    ):
-        self.build_config = build_config
-        self.skip_config = skip_config
-        self.requires_python = requires_python
-        self.prerelease_pythons = prerelease_pythons
 
     def __call__(self, build_id: str) -> bool:
         # Filter build selectors by python_requires if set
@@ -241,9 +237,7 @@ class IdentifierSelector:
                 return False
 
         # filter out the prerelease pythons if self.prerelease_pythons is False
-        if not self.prerelease_pythons and selector_matches(
+        if not self.prerelease_pythons and selector_matches(self.PRERELEASE_SKIP, build_id):
-            BuildSelector.PRERELEASE_SKIP, build_id
-        ):
             return False
 
         should_build = selector_matches(self.build_config, build_id)
@@ -251,28 +245,17 @@ class IdentifierSelector:
 
         return should_build and not should_skip
 
-    def __repr__(self) -> str:
-        result = f"{self.__class__.__name__}(build_config={self.build_config!r}"
-
-        if self.skip_config:
-            result += f", skip_config={self.skip_config!r}"
-        if self.prerelease_pythons:
-            result += ", prerelease_pythons=True"
-
-        result += ")"
-
-        return result
-
 
+@dataclasses.dataclass
 class BuildSelector(IdentifierSelector):
     pass
 
 
 # Note that requires-python is not needed for TestSelector, as you can't test
 # what you can't build.
+@dataclasses.dataclass
 class TestSelector(IdentifierSelector):
-    def __init__(self, *, skip_config: str):
+    build_config: str = "*"
-        super().__init__(build_config="*", skip_config=skip_config)
 
 
 # Taken from https://stackoverflow.com/a/107717