refactor: identifiers in a file (#511)

* refactor: identifiers in a file

* chore: more typing

* refactor: PlatStr -> PlatformName

* refactor: load in file, use importlib.resources

* refactor: change toml structure

* refactor: use common Traversable

* fix: ensure reasonable version of importlib_resources

* style: fix extra line

cibuildwheel/__main__.py

@@ -12,6 +12,7 @@ import cibuildwheel.linux
 import cibuildwheel.macos
 import cibuildwheel.windows
 from cibuildwheel.environment import EnvironmentParseError, parse_environment
+from cibuildwheel.typing import PLATFORMS, PlatformName, assert_never
 from cibuildwheel.util import (
     Architecture,
     BuildOptions,
@@ -46,6 +47,8 @@ def get_option_from_environment(option_name: str, platform: Optional[str] = None
 
 
 def main() -> None:
+    platform: PlatformName
+
     parser = argparse.ArgumentParser(
         description='Build wheels for all the platforms.',
         epilog='''
@@ -120,6 +123,10 @@ def main() -> None:
                   file=sys.stderr)
             exit(2)
 
+    if platform not in PLATFORMS:
+        print(f'cibuildwheel: Unsupported platform: {platform}', file=sys.stderr)
+        exit(2)
+
     package_dir = Path(args.package_dir)
     output_dir = Path(args.output_dir)
 
@@ -127,8 +134,10 @@ def main() -> None:
         repair_command_default = 'auditwheel repair -w {dest_dir} {wheel}'
     elif platform == 'macos':
         repair_command_default = 'delocate-listdeps {wheel} && delocate-wheel --require-archs x86_64 -w {dest_dir} {wheel}'
-    else:
+    elif platform == 'windows':
         repair_command_default = ''
+    else:
+        assert_never(platform)
 
     build_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '')
     environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform, default='')
@@ -248,8 +257,7 @@ def main() -> None:
     elif platform == 'macos':
         cibuildwheel.macos.build(build_options)
     else:
-        print(f'cibuildwheel: Unsupported platform: {platform}', file=sys.stderr)
+        assert_never(platform)
-        exit(2)
 
 
 def detect_obsolete_options() -> None:
@@ -302,6 +310,7 @@ def print_preamble(platform: str, build_options: BuildOptions) -> None:
 def print_build_identifiers(
     platform: str, build_selector: BuildSelector, architectures: Set[Architecture]
 ) -> None:
+
     python_configurations: List[Any] = []
     if platform == 'linux':
         python_configurations = cibuildwheel.linux.get_python_configurations(build_selector, architectures)

cibuildwheel/linux.py

@@ -15,6 +15,8 @@ from .util import (
     allowed_architectures_check,
     get_build_verbosity_extra_flags,
     prepare_command,
+    read_python_configs,
+    resources_dir,
 )
 
 
@@ -29,42 +31,13 @@ class PythonConfiguration(NamedTuple):
 
 
 def get_python_configurations(
-    build_selector: BuildSelector, architectures: Set[Architecture]
+    build_selector: BuildSelector,
+    architectures: Set[Architecture]
 ) -> List[PythonConfiguration]:
-    python_configurations = [
+
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_x86_64', path_str='/opt/python/cp27-cp27m'),
+    full_python_configs = read_python_configs('linux')
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_x86_64', path_str='/opt/python/cp27-cp27mu'),
+
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_x86_64', path_str='/opt/python/cp35-cp35m'),
+    python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_x86_64', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_x86_64', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_x86_64', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_x86_64', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_i686', path_str='/opt/python/cp27-cp27m'),
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_i686', path_str='/opt/python/cp27-cp27mu'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_i686', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_i686', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_i686', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_i686', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_i686', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='2.7', identifier='pp27-manylinux_x86_64', path_str='/opt/python/pp27-pypy_73'),
-        PythonConfiguration(version='3.6', identifier='pp36-manylinux_x86_64', path_str='/opt/python/pp36-pypy36_pp73'),
-        PythonConfiguration(version='3.7', identifier='pp37-manylinux_x86_64', path_str='/opt/python/pp37-pypy37_pp73'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_aarch64', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_aarch64', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_aarch64', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_aarch64', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_aarch64', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_ppc64le', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_ppc64le', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_ppc64le', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_ppc64le', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_ppc64le', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_s390x', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_s390x', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_s390x', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_s390x', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_s390x', path_str='/opt/python/cp39-cp39'),
-    ]
 
     # return all configurations whose arch is in our `architectures` set,
     # and match the build/skip rules
@@ -76,7 +49,7 @@ def get_python_configurations(
 
 
 def build(options: BuildOptions) -> None:
-    allowed_architectures_check("linux", options)
+    allowed_architectures_check('linux', options)
 
     try:
         subprocess.check_output(['docker', '--version'])
@@ -136,7 +109,7 @@ def build(options: BuildOptions) -> None:
                     if config.identifier.startswith("pp"):
                         # Patch PyPy to make sure headers get installed into a venv
                         patch_version = '_27' if config.version == '2.7' else ''
-                        patch_path = Path(__file__).absolute().parent / 'resources' / f'pypy_venv{patch_version}.patch'
+                        patch_path = resources_dir / f'pypy_venv{patch_version}.patch'
                         patch_docker_path = PurePath('/pypy_venv.patch')
                         docker.copy_into(patch_path, patch_docker_path)
                         try:

cibuildwheel/macos.py

@@ -20,6 +20,8 @@ from .util import (
     get_pip_script,
     install_certifi_script,
     prepare_command,
+    read_python_configs,
+    resources_dir,
 )
 
 
@@ -39,20 +41,12 @@ class PythonConfiguration(NamedTuple):
     url: str
 
 
-def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfiguration]:
+def get_python_configurations(
-    python_configurations = [
+        build_selector: BuildSelector) -> List[PythonConfiguration]:
-        # CPython
+
-        PythonConfiguration(version='2.7', identifier='cp27-macosx_x86_64', url='https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg'),
+    full_python_configs = read_python_configs('macos')
-        PythonConfiguration(version='3.5', identifier='cp35-macosx_x86_64', url='https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'),
+
-        PythonConfiguration(version='3.6', identifier='cp36-macosx_x86_64', url='https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg'),
+    python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
-        PythonConfiguration(version='3.7', identifier='cp37-macosx_x86_64', url='https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg'),
-        PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.7/python-3.8.7-macosx10.9.pkg'),
-        PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.1/python-3.9.1-macosx10.9.pkg'),
-        # PyPy
-        PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2'),
-        PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2'),
-        PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2'),
-    ]
 
     # skip builds as required
     return [c for c in python_configurations if build_selector(c.identifier)]
@@ -115,7 +109,7 @@ def install_pypy(version: str, url: str) -> Path:
         call(['tar', '-C', '/tmp', '-xf', downloaded_tar_bz2])
         # Patch PyPy to make sure headers get installed into a venv
         patch_version = '_27' if version == '2.7' else ''
-        patch_path = Path(__file__).absolute().parent / 'resources' / f'pypy_venv{patch_version}.patch'
+        patch_path = resources_dir / f'pypy_venv{patch_version}.patch'
         call(['patch', '--force', '-p1', '-d', installation_path, '-i', patch_path])
 
     installation_bin_path = installation_path / 'bin'

cibuildwheel/resources/build-platforms.toml

@@ -0,0 +1,67 @@
+[linux]
+python_configurations = [
+  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
+  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
+  { identifier = "cp35-manylinux_x86_64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
+  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
+  { identifier = "cp35-manylinux_i686", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp36-manylinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-manylinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-manylinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "pp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/pp27-pypy_73" },
+  { identifier = "pp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/pp36-pypy36_pp73" },
+  { identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "cp35-manylinux_aarch64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp36-manylinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp35-manylinux_ppc64le", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp36-manylinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-manylinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-manylinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-manylinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp35-manylinux_s390x", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp36-manylinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-manylinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-manylinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+]
+
+[macos]
+python_configurations = [
+  { identifier = "cp27-macosx_x86_64", version = "2.7", url = "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" },
+  { identifier = "cp35-macosx_x86_64", version = "3.5", url = "https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg" },
+  { identifier = "cp36-macosx_x86_64", version = "3.6", url = "https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg" },
+  { identifier = "cp37-macosx_x86_64", version = "3.7", url = "https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg" },
+  { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.7/python-3.8.7-macosx10.9.pkg" },
+  { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macosx10.9.pkg" },
+  { identifier = "pp27-macosx_x86_64", version = "2.7", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2" },
+  { identifier = "pp36-macosx_x86_64", version = "3.6", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2" },
+  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2" },
+]
+
+[windows]
+python_configurations = [
+  { identifier = "cp27-win32", version = "2.7.18", arch = "32" },
+  { identifier = "cp27-win_amd64", version = "2.7.18", arch = "64" },
+  { identifier = "cp35-win32", version = "3.5.4", arch = "32" },
+  { identifier = "cp35-win_amd64", version = "3.5.4", arch = "64" },
+  { identifier = "cp36-win32", version = "3.6.8", arch = "32" },
+  { identifier = "cp36-win_amd64", version = "3.6.8", arch = "64" },
+  { identifier = "cp37-win32", version = "3.7.9", arch = "32" },
+  { identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" },
+  { identifier = "cp38-win32", version = "3.8.7", arch = "32" },
+  { identifier = "cp38-win_amd64", version = "3.8.7", arch = "64" },
+  { identifier = "cp39-win32", version = "3.9.1", arch = "32" },
+  { identifier = "cp39-win_amd64", version = "3.9.1", arch = "64" },
+  { identifier = "pp27-win32", version = "2.7", arch = "32", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-win32.zip" },
+  { identifier = "pp36-win32", version = "3.6", arch = "32", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-win32.zip" },
+  { identifier = "pp37-win32", version = "3.7", arch = "32", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip" },
+]

cibuildwheel/typing.py

@@ -1,6 +1,13 @@
 import os
 import subprocess
-from typing import TYPE_CHECKING, Union
+import sys
+from typing import TYPE_CHECKING, NoReturn, Set, Union
+
+if sys.version_info < (3, 8):
+    from typing_extensions import Final, Literal
+else:
+    from typing import Final, Literal
+
 
 if TYPE_CHECKING:
     PopenBytes = subprocess.Popen[bytes]
@@ -8,3 +15,11 @@ if TYPE_CHECKING:
 else:
     PopenBytes = subprocess.Popen
     PathOrStr = Union[str, "os.PathLike[str]"]
+
+
+PlatformName = Literal["linux", "macos", "windows"]
+PLATFORMS: Final[Set[PlatformName]] = {"linux", "macos", "windows"}
+
+
+def assert_never(value: NoReturn) -> NoReturn:
+    assert False, f'Unhandled value: {value} ({type(value).__name__})'  # noqa: B011

cibuildwheel/util.py

@@ -13,14 +13,20 @@ from time import sleep
 from typing import Dict, List, NamedTuple, Optional, Set
 
 import certifi
+import toml
 
 from .environment import ParsedEnvironment
-from .typing import PathOrStr
+from .typing import PathOrStr, PlatformName
 
-if sys.version_info < (3, 8):
+if sys.version_info < (3, 9):
-    from typing_extensions import Literal
+    from importlib_resources import files
 else:
-    from typing import Literal
+    from importlib.resources import files
+
+
+resources_dir = files('cibuildwheel') / 'resources'
+get_pip_script = resources_dir / 'get-pip.py'
+install_certifi_script = resources_dir / "install_certifi.py"
 
 
 def prepare_command(command: str, **kwargs: PathOrStr) -> str:
@@ -42,6 +48,13 @@ def get_build_verbosity_extra_flags(level: int) -> List[str]:
         return []
 
 
+def read_python_configs(config: PlatformName) -> List[Dict[str, str]]:
+    input_file = resources_dir / 'build-platforms.toml'
+    loaded_file = toml.load(input_file)
+    results: List[Dict[str, str]] = list(loaded_file[config]['python_configurations'])
+    return results
+
+
 class BuildSelector:
     def __init__(self, build_config: str, skip_config: str):
         self.build_patterns = build_config.split()
@@ -151,7 +164,7 @@ class Architecture(Enum):
         return self.value < other.value
 
     @staticmethod
-    def parse_config(config: str, platform: str) -> 'Set[Architecture]':
+    def parse_config(config: str, platform: PlatformName) -> 'Set[Architecture]':
         result = set()
         for arch_str in re.split(r'[\s,]+', config):
             if arch_str == 'auto':
@@ -161,7 +174,7 @@ class Architecture(Enum):
         return result
 
     @staticmethod
-    def auto_archs(platform: str) -> 'Set[Architecture]':
+    def auto_archs(platform: PlatformName) -> 'Set[Architecture]':
         native_architecture = Architecture(platform_module.machine())
         result = {native_architecture}
         if platform == 'linux' and native_architecture == Architecture.x86_64:
@@ -190,11 +203,6 @@ class BuildOptions(NamedTuple):
     build_verbosity: int
 
 
-resources_dir = Path(__file__).resolve().parent / 'resources'
-get_pip_script = resources_dir / 'get-pip.py'
-install_certifi_script = resources_dir / "install_certifi.py"
-
-
 class NonPlatformWheelError(Exception):
     def __init__(self) -> None:
         message = textwrap.dedent('''
@@ -255,7 +263,7 @@ ALLOWED_ARCHITECTURES = {
 
 
 def allowed_architectures_check(
-    name: Literal['linux', 'macos', 'windows'],
+    name: PlatformName,
     options: BuildOptions,
 ) -> None:
 

cibuildwheel/windows.py

@@ -22,6 +22,7 @@ from .util import (
     get_build_verbosity_extra_flags,
     get_pip_script,
     prepare_command,
+    read_python_configs,
 )
 
 IS_RUNNING_ON_AZURE = Path('C:\\hostedtoolcache').exists()
@@ -52,35 +53,23 @@ class PythonConfiguration(NamedTuple):
     version: str
     arch: str
     identifier: str
-    url: Optional[str]
+    url: Optional[str] = None
 
 
-def get_python_configurations(build_selector: BuildSelector, architectures: Set[Architecture]) -> List[PythonConfiguration]:
+def get_python_configurations(
+        build_selector: BuildSelector,
+        architectures: Set[Architecture],
+) -> List[PythonConfiguration]:
+
+    full_python_configs = read_python_configs('windows')
+
+    python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
+
     map_arch = {
         '32': Architecture.x86,
         '64': Architecture.AMD64,
     }
 
-    python_configurations = [
-        # CPython
-        PythonConfiguration(version='2.7.18', arch='32', identifier='cp27-win32', url=None),
-        PythonConfiguration(version='2.7.18', arch='64', identifier='cp27-win_amd64', url=None),
-        PythonConfiguration(version='3.5.4', arch='32', identifier='cp35-win32', url=None),
-        PythonConfiguration(version='3.5.4', arch='64', identifier='cp35-win_amd64', url=None),
-        PythonConfiguration(version='3.6.8', arch='32', identifier='cp36-win32', url=None),
-        PythonConfiguration(version='3.6.8', arch='64', identifier='cp36-win_amd64', url=None),
-        PythonConfiguration(version='3.7.9', arch='32', identifier='cp37-win32', url=None),
-        PythonConfiguration(version='3.7.9', arch='64', identifier='cp37-win_amd64', url=None),
-        PythonConfiguration(version='3.8.7', arch='32', identifier='cp38-win32', url=None),
-        PythonConfiguration(version='3.8.7', arch='64', identifier='cp38-win_amd64', url=None),
-        PythonConfiguration(version='3.9.1', arch='32', identifier='cp39-win32', url=None),
-        PythonConfiguration(version='3.9.1', arch='64', identifier='cp39-win_amd64', url=None),
-        # PyPy
-        PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.3-win32.zip'),
-        PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.3-win32.zip'),
-        PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip'),
-    ]
-
     if IS_RUNNING_ON_TRAVIS:
         # cannot install VCForPython27.msi which is needed for compiling C software
         # try with (and similar): msiexec /i VCForPython27.msi ALLUSERS=1 ACCEPT=YES /passive
@@ -210,14 +199,14 @@ def pep_518_cp35_workaround(package_dir: Path, env: Dict[str, str]) -> None:
             log.step('Performing PEP518 workaround...')
             with tempfile.TemporaryDirectory() as d:
                 reqfile = Path(d) / "requirements.txt"
-                with reqfile.open("w") as f:
+                with reqfile.open('w') as f:
                     for r in requirements:
                         print(r, file=f)
                 call(['pip', 'install', '-r', reqfile], env=env)
 
 
 def build(options: BuildOptions) -> None:
-    allowed_architectures_check("windows", options)
+    allowed_architectures_check('windows', options)
 
     temp_dir = Path(tempfile.mkdtemp(prefix='cibuildwheel'))
     built_wheel_dir = temp_dir / 'built_wheel'

setup.cfg

@@ -32,6 +32,7 @@ install_requires =
     toml
     certifi
     typing_extensions; python_version < '3.8'
+    importlib_resources>=1.4; python_version < '3.9'
 
 [options.package_data]
 cibuildwheel = resources/*
@@ -112,6 +113,10 @@ ignore_missing_imports = True
 [mypy-bashlex.*]
 ignore_missing_imports = True
 
+# Has type stubs, but no pyproject.toml or .pyi files in the wheel.
+[mypy-toml.*]
+ignore_missing_imports = True
+
 [tool:isort]
 profile=black
 multi_line_output=3

unit_test/build_ids_test.py

@@ -0,0 +1,28 @@
+import toml
+from toml.encoder import TomlEncoder
+
+from cibuildwheel.util import resources_dir
+
+
+class InlineArrayDictEncoder(TomlEncoder):
+    def dump_sections(self, o: dict, sup: str):
+        if all(isinstance(a, list) for a in o.values()):
+            val = ""
+            for k, v in o.items():
+                inner = ",\n  ".join(self.dump_inline_table(d_i).strip() for d_i in v)
+                val += f"{k} = [\n  {inner},\n]\n"
+            return val, self._dict()
+        else:
+            return super().dump_sections(o, sup)
+
+
+def test_compare_configs():
+    with open(resources_dir / "build-platforms.toml") as f:
+        txt = f.read()
+
+    dict_txt = toml.loads(txt)
+
+    new_txt = toml.dumps(dict_txt, encoder=InlineArrayDictEncoder())
+    print(new_txt)
+
+    assert new_txt == txt