fix: restore Python 3.7 support

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

Author: henryiii

bin/update_pythons.py

@@ -24,8 +24,8 @@
 from rich.logging import RichHandler
 from rich.syntax import Syntax
 
+from cibuildwheel._compat.typing import Final, Literal, TypedDict
 from cibuildwheel.extra import dump_python_configurations
-from cibuildwheel.typing import Final, Literal, TypedDict
 
 log = logging.getLogger("cibw")
 

bin/update_virtualenv.py

@@ -21,7 +21,7 @@
 from rich.logging import RichHandler
 from rich.syntax import Syntax
 
-from cibuildwheel.typing import Final
+from cibuildwheel._compat.typing import Final
 
 log = logging.getLogger("cibw")
 

cibuildwheel/__main__.py

@@ -16,15 +16,16 @@
 import cibuildwheel.macos
 import cibuildwheel.util
 import cibuildwheel.windows
-from cibuildwheel.architecture import Architecture, allowed_architectures_check
-from cibuildwheel.logger import log
-from cibuildwheel.options import CommandLineArguments, Options, compute_options
-from cibuildwheel.typing import (
+from cibuildwheel._compat.typing import (
     PLATFORMS,
     GenericPythonConfiguration,
     PlatformName,
+    Protocol,
     assert_never,
 )
+from cibuildwheel.architecture import Architecture, allowed_architectures_check
+from cibuildwheel.logger import log
+from cibuildwheel.options import CommandLineArguments, Options, compute_options
 from cibuildwheel.util import (
     CIBW_CACHE_PATH,
     BuildSelector,
@@ -244,7 +245,7 @@ def _compute_platform(args: CommandLineArguments) -> PlatformName:
     return _compute_platform_ci()
 
 
-class PlatformModule(typing.Protocol):
+class PlatformModule(Protocol):
     # note that as per PEP544, the self argument is ignored when the protocol
     # is applied to a module
     def get_python_configurations(

cibuildwheel/_compat/__init__.py

@@ -0,0 +1 @@
+from __future__ import annotations

cibuildwheel/functools_cached_property_38.py renamed to cibuildwheel/_compat/_functools_cached_property_38.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+import sys
+
+if sys.version_info >= (3, 8):
+    from functools import cached_property
+else:
+    from ._functools_cached_property_38 import cached_property
+
+__all__ = ("cached_property",)

cibuildwheel/_compat/functools.py

@@ -8,12 +8,12 @@
 if sys.version_info < (3, 8):
     from typing_extensions import Final, Literal, OrderedDict, Protocol, TypedDict
 else:
-    from typing import Final, Literal, OrderedDict, Protocol, TypedDict
+    from typing import Final, Literal, OrderedDict, Protocol, TypedDict  # noqa: TID251
 
 if sys.version_info < (3, 11):
     from typing_extensions import NotRequired, assert_never
 else:
-    from typing import NotRequired, assert_never
+    from typing import NotRequired, assert_never  # noqa: TID251
 
 __all__ = (
     "Final",

cibuildwheel/typing.py renamed to cibuildwheel/_compat/typing.py

@@ -7,7 +7,7 @@
 from collections.abc import Set
 from enum import Enum
 
-from .typing import Final, Literal, PlatformName, assert_never
+from ._compat.typing import Final, Literal, PlatformName, assert_never
 
 PRETTY_NAMES: Final = {"linux": "Linux", "macos": "macOS", "windows": "Windows"}
 

cibuildwheel/architecture.py

@@ -7,9 +7,8 @@
 import bashlex
 import bashlex.errors
 
-from cibuildwheel.typing import Protocol
-
 from . import bashlex_eval
+from ._compat.typing import Protocol
 
 
 class EnvironmentParseError(Exception):

cibuildwheel/environment.py

@@ -7,7 +7,7 @@
 from collections.abc import Mapping, Sequence
 from io import StringIO
 
-from .typing import Protocol
+from ._compat.typing import Protocol
 
 __all__ = ("Printable", "dump_python_configurations")