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

test/test_0_basic.py

@@ -1,8 +1,10 @@
 import platform
 import textwrap
+
 import pytest
 
 from cibuildwheel.logger import Logger
+
 from . import test_projects, utils
 
 basic_project = test_projects.new_c_project(

test/test_before_all.py

@@ -1,9 +1,9 @@
-import pytest
 import subprocess
 import textwrap
 
-from . import utils
-from . import test_projects
+import pytest
+
+from . import test_projects, utils
 
 project_with_before_build_asserts = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_before_build.py

@@ -1,9 +1,9 @@
-import pytest
 import subprocess
 import textwrap
 
-from . import utils
-from . import test_projects
+import pytest
+
+from . import test_projects, utils
 
 project_with_before_build_asserts = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_before_test.py

@@ -1,5 +1,4 @@
-from . import test_projects
-from . import utils
+from . import test_projects, utils
 
 before_test_project = test_projects.new_c_project()
 before_test_project.files['test/spam_test.py'] = r'''

test/test_build_skip.py

@@ -1,7 +1,6 @@
 import textwrap
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 project_with_skip_asserts = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_dependency_versions.py

@@ -1,11 +1,11 @@
 import re
-import pytest
 import textwrap
+
+import pytest
+
 import cibuildwheel.util
 
-from . import utils
-from . import test_projects
-
+from . import test_projects, utils
 
 project_with_expected_version_checks = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_docker_images.py

@@ -3,8 +3,7 @@ import textwrap
 
 import pytest
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 dockcross_only_project = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_emulation.py

@@ -1,8 +1,8 @@
 import subprocess
-import pytest
-from . import utils
-from . import test_projects
 
+import pytest
+
+from . import test_projects, utils
 
 project_with_a_test = test_projects.new_c_project()
 

test/test_environment.py

@@ -1,10 +1,10 @@
 import os
-import pytest
 import subprocess
 import textwrap
-from . import utils
-from . import test_projects
 
+import pytest
+
+from . import test_projects, utils
 
 project_with_environment_asserts = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_macos_archs.py

@@ -1,6 +1,7 @@
-import pytest
 import platform
 
+import pytest
+
 from . import test_projects, utils
 
 basic_project = test_projects.new_c_project()

test/test_manylinuxXXXX_only.py

@@ -3,8 +3,7 @@ import textwrap
 
 import pytest
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 # TODO: specify these at runtime according to manylinux_image
 project_with_manylinux_symbols = test_projects.new_c_project(

test/test_pep518.py

@@ -1,7 +1,7 @@
-import textwrap
-from . import test_projects
-from . import utils
 import os
+import textwrap
+
+from . import test_projects, utils
 
 basic_project = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(

test/test_projects/base.py

@@ -1,10 +1,8 @@
 from pathlib import Path
+from typing import Any, Dict, Union
 
 import jinja2
 
-from typing import Union, Dict, Any
-
-
 FilesDict = Dict[str, Union[str, jinja2.Template]]
 TemplateContext = Dict[str, Any]
 

test/test_projects/c.py

@@ -1,6 +1,6 @@
 import jinja2
-from .base import TestProject
 
+from .base import TestProject
 
 SPAM_C_TEMPLATE = r'''
 #include <Python.h>

test/test_pure_wheel.py

@@ -1,6 +1,8 @@
 import subprocess
-import pytest
 from test import test_projects
+
+import pytest
+
 from . import utils
 
 pure_python_project = test_projects.TestProject()

test/test_ssl.py

@@ -1,7 +1,6 @@
 import textwrap
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 project_with_ssl_tests = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_testing.py

@@ -4,8 +4,7 @@ import textwrap
 
 import pytest
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 project_with_a_test = test_projects.new_c_project(
     setup_cfg_add=textwrap.dedent(r'''

test/test_troubleshooting.py

@@ -1,7 +1,9 @@
 import subprocess
+
 import pytest
-from .test_projects import TestProject
+
 from . import utils
+from .test_projects import TestProject
 
 so_file_project = TestProject()
 

test/test_unicode.py

@@ -2,8 +2,7 @@ import textwrap
 
 import pytest
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 project_with_unicode = test_projects.new_c_project(
     spam_c_function_add=textwrap.dedent(r'''