Fix some PEP-008 issues

Author: nsoranzo

cibuildwheel/__main__.py

@@ -1,11 +1,19 @@
 from __future__ import print_function
-import argparse, os, subprocess, sys, textwrap
+
+import argparse
+import os
+import sys
+import textwrap
+import traceback
 
 import cibuildwheel
-import cibuildwheel.linux, cibuildwheel.windows, cibuildwheel.macos
+import cibuildwheel.linux
+import cibuildwheel.macos
+import cibuildwheel.windows
 from cibuildwheel.environment import parse_environment, EnvironmentParseError
 from cibuildwheel.util import BuildSelector, Unbuffered
 
+
 def get_option_from_environment(option_name, platform=None, default=None):
     '''
     Returns an option from the environment, optionally scoped by the platform.
@@ -108,9 +116,8 @@ def main():
 
     try:
         environment = parse_environment(environment_config)
-    except (EnvironmentParseError, ValueError) as e:
+    except (EnvironmentParseError, ValueError):
         print('cibuildwheel: Malformed environment option "%s"' % environment_config, file=sys.stderr)
-        import traceback
         traceback.print_exc(None, sys.stderr)
         exit(2)
 
@@ -207,7 +214,6 @@ def print_preamble(platform, build_options):
 
     print('cibuildwheel version %s\n' % cibuildwheel.__version__)
 
-
     print('Build options:')
     print('  platform: %r' % platform)
     for option, value in sorted(build_options.items()):

cibuildwheel/linux.py

@@ -1,6 +1,11 @@
 from __future__ import print_function
-import os, subprocess, sys, uuid
+
+import os
+import subprocess
+import sys
+import uuid
 from collections import namedtuple
+
 from .util import prepare_command, get_build_verbosity_extra_flags
 
 try:
@@ -33,7 +38,7 @@ def get_python_configurations(build_selector):
 def build(project_dir, output_dir, test_command, test_requires, test_extras, before_build, build_verbosity, build_selector, delocate_command, environment, manylinux_images):
     try:
         subprocess.check_call(['docker', '--version'])
-    except:
+    except Exception:
         print('cibuildwheel: Docker not found. Docker is required to run Linux builds. '
               'If you\'re building on Travis CI, add `services: [docker]` to your .travis.yml.'
               'If you\'re building on Circle CI in Linux, add a `setup_remote_docker` step to your .circleci/config.yml',
@@ -131,7 +136,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
                 for delocated_wheel in "${{delocated_wheels[@]}}"; do chown {uid}:{gid} "/output/$(basename "$delocated_wheel")"; done
             done
         '''.format(
-            pybin_paths=' '.join(c.path+'/bin' for c in platform_configs),
+            pybin_paths=' '.join(c.path + '/bin' for c in platform_configs),
             test_requires=' '.join(test_requires),
             test_extras=test_extras,
             test_command=shlex_quote(
@@ -170,7 +175,7 @@ def run_docker(command, stdin_str=None):
                         '--env', 'CIBUILDWHEEL',
                         '--name', container_name,
                         '-i',
-                        '-v', '/:/host', # ignored on Circle
+                        '-v', '/:/host',  # ignored on Circle
                         docker_image, '/bin/bash'])
             run_docker(['cp', os.path.abspath(project_dir) + '/.', container_name + ':/project'])
             run_docker(['start', '-i', '-a', container_name], stdin_str=bash_script)

cibuildwheel/macos.py

@@ -1,15 +1,20 @@
 from __future__ import print_function
+
 import tempfile
-import os, subprocess, shlex, sys, shutil
+import os
+import subprocess
+import sys
+import shutil
 from collections import namedtuple
 from glob import glob
+
+from .util import prepare_command, get_build_verbosity_extra_flags
+
 try:
     from shlex import quote as shlex_quote
 except ImportError:
     from pipes import quote as shlex_quote
 
-from .util import prepare_command, get_build_verbosity_extra_flags
-
 
 def get_python_configurations(build_selector):
     PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'identifier', 'url'])
@@ -35,7 +40,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
     get_pip_url = 'https://bootstrap.pypa.io/get-pip.py'
     get_pip_script = '/tmp/get-pip.py'
 
-    pkgs_output = subprocess.check_output(['pkgutil',  '--pkgs'])
+    pkgs_output = subprocess.check_output(['pkgutil', '--pkgs'])
     if sys.version_info[0] >= 3:
         pkgs_output = pkgs_output.decode('utf8')
     installed_system_packages = pkgs_output.splitlines()

cibuildwheel/util.py

@@ -1,5 +1,4 @@
 from fnmatch import fnmatch
-import warnings
 
 
 def prepare_command(command, replace_dict):

cibuildwheel/windows.py

@@ -1,20 +1,19 @@
 from __future__ import print_function
-import os, tempfile, subprocess, shutil, sys
+
+import os
+import tempfile
+import subprocess
+import shutil
 from collections import namedtuple
 from glob import glob
 
-try:
-    from shlex import quote as shlex_quote
-except ImportError:
-    from pipes import quote as shlex_quote
+from .util import prepare_command, get_build_verbosity_extra_flags
 
 try:
     from urllib.request import urlopen
 except ImportError:
     from urllib2 import urlopen
 
-from .util import prepare_command, get_build_verbosity_extra_flags
-
 
 IS_RUNNING_ON_AZURE = os.path.exists('C:\\hostedtoolcache')
 IS_RUNNING_ON_TRAVIS = os.environ.get('TRAVIS_OS_NAME') == 'windows'
@@ -31,6 +30,7 @@ def get_nuget_args(configuration):
         python_name = python_name + "x86"
     return [python_name, "-Version", configuration.version, "-OutputDirectory", "C:/cibw/python"]
 
+
 def get_python_configurations(build_selector):
     PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'arch', 'identifier'])
     python_configurations = [
@@ -51,7 +51,7 @@ def get_python_configurations(build_selector):
         # try with (and similar): msiexec /i VCForPython27.msi ALLUSERS=1 ACCEPT=YES /passive
         python_configurations = [c for c in python_configurations if not c.version.startswith('2.7.')]
 
-     # skip builds as required
+    # skip builds as required
     python_configurations = [c for c in python_configurations if build_selector(c.identifier)]
 
     return python_configurations
@@ -62,6 +62,7 @@ def simple_shell(args, env=None, cwd=None):
         print('+ ' + ' '.join(args))
         args = ['cmd', '/E:ON', '/V:ON', '/C'] + args
         return subprocess.check_call(' '.join(args), env=env, cwd=cwd)
+
     def download(url, dest):
         print('+ Download ' + url + ' to ' + dest)
         dest_dir = os.path.dirname(dest)
@@ -73,6 +74,7 @@ def download(url, dest):
                 file.write(response.read())
         finally:
             response.close()
+
     if IS_RUNNING_ON_AZURE or IS_RUNNING_ON_TRAVIS:
         shell = simple_shell
     else:
@@ -103,7 +105,7 @@ def shell(args, env=None, cwd=None):
         config_python_path = get_python_path(config)
         simple_shell([nuget, "install"] + get_nuget_args(config))
         if not os.path.exists(os.path.join(config_python_path, 'Scripts', 'pip.exe')):
-            simple_shell([os.path.join(config_python_path, 'python.exe'), get_pip_script ])
+            simple_shell([os.path.join(config_python_path, 'python.exe'), get_pip_script])
 
         # check python & pip exist for this configuration
         assert os.path.exists(os.path.join(config_python_path, 'python.exe'))

setup.cfg

@@ -19,3 +19,5 @@ replace = cibuildwheel=={new_version}
 [bdist_wheel]
 universal = 1
 
+[flake8]
+ignore = E501