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

unit_test/dependency_constraints_test.py

@@ -1,7 +1,7 @@
-from cibuildwheel.util import DependencyConstraints
-
 from pathlib import Path
 
+from cibuildwheel.util import DependencyConstraints
+
 
 def test_defaults():
     dependency_constraints = DependencyConstraints.with_defaults()

unit_test/download_test.py

@@ -1,9 +1,9 @@
-import certifi
-import pytest
 import ssl
 
-from cibuildwheel.util import download
+import certifi
+import pytest
 
+from cibuildwheel.util import download
 
 DOWNLOAD_URL = 'https://raw.githubusercontent.com/joerick/cibuildwheel/v1.6.3/requirements-dev.txt'
 

unit_test/main_tests/conftest.py

@@ -4,12 +4,7 @@ from pathlib import Path
 
 import pytest
 
-from cibuildwheel import (
-    linux,
-    macos,
-    util,
-    windows,
-)
+from cibuildwheel import linux, macos, util, windows
 
 
 class ArgsInterceptor:

unit_test/main_tests/main_options_test.py

@@ -8,7 +8,6 @@ from cibuildwheel.__main__ import main
 from cibuildwheel.environment import ParsedEnvironment
 from cibuildwheel.util import BuildSelector
 
-
 # CIBW_PLATFORM is tested in main_platform_test.py
 
 

unit_test/main_tests/main_platform_test.py

@@ -1,12 +1,11 @@
 import platform as platform_module
-from cibuildwheel.util import Architecture
 import sys
 
 import pytest
+from conftest import MOCK_PACKAGE_DIR  # noqa: I100
 
 from cibuildwheel.__main__ import main
-
-from conftest import MOCK_PACKAGE_DIR  # noqa: I100
+from cibuildwheel.util import Architecture
 
 
 def test_unknown_platform_non_ci(monkeypatch, capsys):