Fixing flake8 errors and warnings after rebasing

cibuildwheel/macos.py

@@ -96,7 +96,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
             if config.version[0] == '3':
                 patch_file = os.path.abspath(os.path.join(os.path.dirname(__file__), 'resources', 'pypy3.6.patch'))
                 sysconfigdata_file = os.path.join(os.path.dirname(installation_bin_path), 'lib_pypy', '_sysconfigdata.py')
-                subprocess.call(['patch', sysconfigdata_file, patch_file , '-N'])  # Always has nonzero return code
+                subprocess.call(['patch', sysconfigdata_file, patch_file, '-N'])  # Always has nonzero return code
         else:
             raise ValueError("Unknown Python implementation")
 

test/10_cpp_standards/cibuildwheel_test.py

@@ -18,8 +18,8 @@ def test_cpp11(tmp_path):
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
     expected_wheels = [w for w in utils.expected_wheels(
         'spam', '0.1.0', macosx_deployment_target='10.9')
-         if 'cp27-cp27m-win' not in w and
+        if 'cp27-cp27m-win' not in w
-            'pp27-pypy_73-win32' not in w]
+        and 'pp27-pypy_73-win32' not in w]
     assert set(actual_wheels) == set(expected_wheels)
 
 
@@ -36,9 +36,9 @@ def test_cpp14():
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
     expected_wheels = [w for w in utils.expected_wheels(
         'spam', '0.1.0', macosx_deployment_target='10.9')
-        if 'cp27-cp27m-win' not in w and
+        if 'cp27-cp27m-win' not in w
-           'pp27-pypy_73-win32' not in w and
+        and 'pp27-pypy_73-win32' not in w
-           'cp35-cp35m-win' not in w]
+        and 'cp35-cp35m-win' not in w]
     assert set(actual_wheels) == set(expected_wheels)
 
 
@@ -58,8 +58,8 @@ def test_cpp17():
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
     expected_wheels = [w for w in utils.expected_wheels(
         'spam', '0.1.0', macosx_deployment_target='10.13')
-        if 'cp27-cp27m-win' not in w and
+        if 'cp27-cp27m-win' not in w
-           'pp27-pypy_73-win32' not in w and
+        and 'pp27-pypy_73-win32' not in w
-           'cp35-cp35m-win' not in w and
+        and 'cp35-cp35m-win' not in w
-           'pp36-pypy36_pp73-win32' not in w]
+        and 'pp36-pypy36_pp73-win32' not in w]
     assert set(actual_wheels) == set(expected_wheels)

test/shared/utils.py

@@ -92,10 +92,12 @@ def expected_wheels(package_name, package_version, manylinux_versions=['manylinu
                 for architecture in architectures[python_implemention]
                 for manylinux_version in manylinux_versions
             ]
+
         def get_platform_tags(python_abi_tag):
             return platform_tags[python_abi_tag[:2]]
     elif platform == 'windows':
         platform_tags = {'cp': ['win32', 'win_amd64'], 'pp': ['win32']}
+
         def get_platform_tags(python_abi_tag):
             return platform_tags[python_abi_tag[:2]]