Merge pull request #1479 from henryiii/henryiii/fix/py37

fix: Python 3.7 support

Author: joerick

.github/workflows/test.yml

@@ -39,6 +39,9 @@ jobs:
       matrix:
         os: [ubuntu-20.04, windows-latest, macos-11]
         python_version: ['3.11']
+        include:
+        - os: ubuntu-22.04
+          python_version: '3.7'
     timeout-minutes: 180
     steps:
     - uses: actions/checkout@v3

bin/update_pythons.py

@@ -5,27 +5,21 @@
 import copy
 import difflib
 import logging
-import sys
 from collections.abc import Mapping, MutableMapping
 from pathlib import Path
 from typing import Any, Union
 
 import click
 import requests
 import rich
-
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
 from packaging.specifiers import Specifier
 from packaging.version import Version
 from rich.logging import RichHandler
 from rich.syntax import Syntax
 
+from cibuildwheel._compat import tomllib
+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

@@ -5,23 +5,17 @@
 import difflib
 import logging
 import subprocess
-import sys
 from dataclasses import dataclass
 from pathlib import Path
 
 import click
 import rich
-
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
 from packaging.version import InvalidVersion, Version
 from rich.logging import RichHandler
 from rich.syntax import Syntax
 
-from cibuildwheel.typing import Final
+from cibuildwheel._compat import tomllib
+from cibuildwheel._compat.typing import Final
 
 log = logging.getLogger("cibw")
 

cibuildwheel/__main__.py

@@ -16,15 +16,11 @@
 import cibuildwheel.macos
 import cibuildwheel.util
 import cibuildwheel.windows
+from cibuildwheel._compat.typing import 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.typing import (
-    PLATFORMS,
-    GenericPythonConfiguration,
-    PlatformName,
-    assert_never,
-)
+from cibuildwheel.typing import PLATFORMS, GenericPythonConfiguration, PlatformName
 from cibuildwheel.util import (
     CIBW_CACHE_PATH,
     BuildSelector,
@@ -244,7 +240,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

…ildwheel/functools_cached_property_38.py …_compat/_functools_cached_property_38.pycibuildwheel/functools_cached_property_38.py renamed to cibuildwheel/_compat/_functools_cached_property_38.py 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

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+import sys
+
+if sys.version_info >= (3, 11):
+    from tomllib import load  # noqa: TID251
+else:
+    from tomli import load  # noqa: TID251
+
+__all__ = ("load",)

cibuildwheel/_compat/tomllib.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+import sys
+
+if sys.version_info < (3, 8):
+    from typing_extensions import Final, Literal, OrderedDict, Protocol, TypedDict
+else:
+    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  # noqa: TID251
+
+__all__ = (
+    "Final",
+    "Literal",
+    "Protocol",
+    "Protocol",
+    "TypedDict",
+    "OrderedDict",
+    "assert_never",
+    "NotRequired",
+)

cibuildwheel/_compat/typing.py

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