Merge remote-tracking branch 'origin/master' into macos-universal2

cibuildwheel/__main__.py

@@ -5,17 +5,13 @@ import textwrap
 import traceback
 from configparser import ConfigParser
 from pathlib import Path
-
 from typing import Any, Dict, List, Optional, Set, overload
 
 import cibuildwheel
 import cibuildwheel.linux
 import cibuildwheel.macos
 import cibuildwheel.windows
-from cibuildwheel.environment import (
-    EnvironmentParseError,
-    parse_environment,
-)
+from cibuildwheel.environment import EnvironmentParseError, parse_environment
 from cibuildwheel.util import (
     Architecture,
     BuildOptions,

cibuildwheel/docker_container.py

@@ -6,8 +6,8 @@ import subprocess
 import sys
 import uuid
 from pathlib import Path, PurePath
-from typing import cast, IO, Dict, List, Optional, Sequence, Type
 from types import TracebackType
+from typing import IO, Dict, List, Optional, Sequence, Type, cast
 
 from .typing import PathOrStr, PopenBytes
 

cibuildwheel/environment.py

@@ -1,7 +1,7 @@
-import bashlex
-
 from typing import Dict, List, Mapping, Optional
 
+import bashlex
+
 from . import bashlex_eval
 
 

cibuildwheel/linux.py

@@ -6,11 +6,16 @@ from typing import List, NamedTuple, Set
 
 from .docker_container import DockerContainer
 from .logger import log
-from .util import (
-    Architecture, BuildOptions, BuildSelector, NonPlatformWheelError,
-    allowed_architectures_check, get_build_verbosity_extra_flags, prepare_command,
-)
 from .typing import PathOrStr
+from .util import (
+    Architecture,
+    BuildOptions,
+    BuildSelector,
+    NonPlatformWheelError,
+    allowed_architectures_check,
+    get_build_verbosity_extra_flags,
+    prepare_command,
+)
 
 
 class PythonConfiguration(NamedTuple):

cibuildwheel/logger.py

@@ -3,7 +3,7 @@ import os
 import re
 import sys
 import time
-from typing import Optional, Union, AnyStr, IO
+from typing import IO, AnyStr, Optional, Union
 
 from cibuildwheel.util import CIProvider, detect_ci_provider
 

cibuildwheel/macos.py

@@ -10,11 +10,20 @@ from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple,
 
 from .environment import ParsedEnvironment
 from .logger import log
-from .util import (Architecture, BuildOptions, BuildSelector, NonPlatformWheelError,
-                   download, get_build_verbosity_extra_flags, get_pip_script,
-                   install_certifi_script, prepare_command, allowed_architectures_check,
-                   unwrap)
 from .typing import PathOrStr
+from .util import (
+    Architecture,
+    BuildOptions,
+    BuildSelector,
+    NonPlatformWheelError,
+    allowed_architectures_check,
+    download,
+    get_build_verbosity_extra_flags,
+    get_pip_script,
+    install_certifi_script,
+    prepare_command,
+    unwrap,
+)
 
 
 def call(args: Sequence[PathOrStr], env: Optional[Dict[str, str]] = None, cwd: Optional[str] = None, shell: bool = False) -> int:

cibuildwheel/resources/get-pip.py

@@ -23,8 +23,8 @@
 import os.path
 import pkgutil
 import shutil
-import sys
 import struct
+import sys
 import tempfile
 
 # Useful for very coarse version differentiation.

cibuildwheel/resources/install_certifi.py

@@ -29,6 +29,7 @@ def main():
                            "-E", "-s", "-m", "pip", "install", "--upgrade", "certifi"])
 
     import certifi
+
     # change working directory to the default SSL directory
     os.chdir(openssl_dir)
     relpath_to_certifi_cafile = os.path.relpath(certifi.where())

cibuildwheel/typing.py

@@ -1,7 +1,6 @@
-from typing import Union, TYPE_CHECKING
 import os
 import subprocess
-
+from typing import TYPE_CHECKING, Union
 
 if TYPE_CHECKING:
     PopenBytes = subprocess.Popen[bytes]

cibuildwheel/util.py

@@ -1,9 +1,9 @@
+import functools
 import os
 import platform as platform_module
 import re
 import ssl
 import sys
-import functools
 import textwrap
 import urllib.request
 from enum import Enum

cibuildwheel/windows.py

@@ -11,10 +11,18 @@ import toml
 
 from .environment import ParsedEnvironment
 from .logger import log
-from .util import (Architecture, BuildOptions, BuildSelector, NonPlatformWheelError,
-                   download, get_build_verbosity_extra_flags, get_pip_script,
-                   prepare_command, allowed_architectures_check)
 from .typing import PathOrStr
+from .util import (
+    Architecture,
+    BuildOptions,
+    BuildSelector,
+    NonPlatformWheelError,
+    allowed_architectures_check,
+    download,
+    get_build_verbosity_extra_flags,
+    get_pip_script,
+    prepare_command,
+)
 
 IS_RUNNING_ON_AZURE = Path('C:\\hostedtoolcache').exists()
 IS_RUNNING_ON_TRAVIS = os.environ.get('TRAVIS_OS_NAME') == 'windows'