Use Flake8 on the test of pip's Python files

Author: dstufft

contrib/build-installer

@@ -54,7 +54,7 @@ def bootstrap(tmpdir=None):
         # We want to see if setuptools is available before attempting to
         # install it
         try:
-            import setuptools
+            import setuptools  # noqa
         except ImportError:
             packages += ["setuptools"]
 

contrib/get-pip.py

@@ -20304,7 +20304,7 @@ def bootstrap(tmpdir=None):
         # We want to see if setuptools is available before attempting to
         # install it
         try:
-            import setuptools
+            import setuptools  # noqa
         except ImportError:
             packages += ["setuptools"]
 

docs/conf.py

@@ -3,7 +3,7 @@
 # pip documentation build configuration file, created by
 # sphinx-quickstart on Tue Apr 22 22:08:49 2008
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its containing dir
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
@@ -22,10 +22,10 @@
 sys.path.insert(0, os.path.abspath(os.pardir))
 #sys.path.append(os.path.join(os.path.dirname(__file__), '../'))
 
-# -- General configuration -----------------------------------------------------
+# -- General configuration ----------------------------------------------------
 
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 #extensions = ['sphinx.ext.autodoc']
 extensions = ['docs.pipext']
 
@@ -76,7 +76,7 @@
 # for source files.
 exclude_trees = ['build']
 
-# The reST default role (used for this markup: `text`) to use for all documents.
+# The reST default role (used for this markup: `text`) to use for all documents
 #default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -96,7 +96,7 @@
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
@@ -176,7 +176,7 @@
 htmlhelp_basename = 'pipdocs'
 
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output -------------------------------------------------
 
 # The paper size ('letter' or 'a4').
 #latex_paper_size = 'letter'
@@ -185,10 +185,15 @@
 #latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
+# (source start file, target name, title, author, documentclass [howto/manual])
 latex_documents = [
-  ('index', 'pip.tex', u'pip Documentation',
-   u'The pip developers', 'manual'),
+    (
+        'index',
+        'pip.tex',
+        u'pip Documentation',
+        u'The pip developers',
+        'manual',
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

docs/pipext.py

@@ -59,7 +59,10 @@ def _format_option(self, option, cmd_name=None):
         opt_help = option.help.replace('%default', str(option.default))
         #fix paths with sys.prefix
         opt_help = opt_help.replace(sys.prefix, "<sys.prefix>")
-        opt_help = opt_help.replace(default_log_file, "<see :ref:`FileLogging`>")
+        opt_help = opt_help.replace(
+            default_log_file,
+            "<see :ref:`FileLogging`>",
+        )
         return [bookmark_line, "", line, "", "    %s" % opt_help, ""]
 
     def _format_options(self, options, cmd_name=None):
@@ -80,20 +83,27 @@ def run(self):
 
 class PipGeneralOptions(PipOptions):
     def process_options(self):
-        self._format_options([o.make() for o in cmdoptions.general_group['options']])
+        self._format_options(
+            [o.make() for o in cmdoptions.general_group['options']]
+        )
 
 
 class PipIndexOptions(PipOptions):
     def process_options(self):
-        self._format_options([o.make() for o in cmdoptions.index_group['options']])
+        self._format_options(
+            [o.make() for o in cmdoptions.index_group['options']]
+        )
 
 
 class PipCommandOptions(PipOptions):
     required_arguments = 1
 
     def process_options(self):
         cmd = commands[self.arguments[0]]()
-        self._format_options(cmd.parser.option_groups[0].option_list, cmd_name=cmd.name)
+        self._format_options(
+            cmd.parser.option_groups[0].option_list,
+            cmd_name=cmd.name,
+        )
 
 
 def setup(app):

setup.py

@@ -25,8 +25,8 @@ def run_tests(self):
 
 
 def read(*parts):
-    # intentionally *not* adding an encoding option to open
-    # see here: https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690
+    # intentionally *not* adding an encoding option to open, See:
+    #   https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690
     return codecs.open(os.path.join(here, *parts), 'r').read()
 
 
@@ -43,40 +43,46 @@ def find_version(*file_paths):
 
 tests_require = ['pytest', 'virtualenv>=1.10', 'scripttest>=1.3', 'mock']
 
-setup(name="pip",
-      version=find_version('pip', '__init__.py'),
-      description="A tool for installing and managing Python packages.",
-      long_description=long_description,
-      classifiers=[
-          'Development Status :: 5 - Production/Stable',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: MIT License',
-          'Topic :: Software Development :: Build Tools',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.6',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.1',
-          'Programming Language :: Python :: 3.2',
-          'Programming Language :: Python :: 3.3',
-      ],
-      keywords='easy_install distutils setuptools egg virtualenv',
-      author='The pip developers',
-      author_email='[email protected]',
-      url='http://www.pip-installer.org',
-      license='MIT',
-      packages=find_packages(exclude=["contrib", "docs", "tests*"]),
-      package_data={
-          'pip._vendor.requests': ['*.pem'],
-          'pip._vendor.distlib._backport': ['sysconfig.cfg'],
-          'pip._vendor.distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
-      },
-      entry_points=dict(console_scripts=['pip=pip:main', 'pip%s=pip:main' % sys.version[:1],
-          'pip%s=pip:main' % sys.version[:3]]),
-      tests_require=tests_require,
-      zip_safe=False,
-      extras_require={
-          'testing': tests_require,
-      },
-      cmdclass = {'test': PyTest},
+setup(
+    name="pip",
+    version=find_version("pip", "__init__.py"),
+    description="A tool for installing and managing Python packages.",
+    long_description=long_description,
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Topic :: Software Development :: Build Tools",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.1",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+    ],
+    keywords='easy_install distutils setuptools egg virtualenv',
+    author='The pip developers',
+    author_email='[email protected]',
+    url='http://www.pip-installer.org',
+    license='MIT',
+    packages=find_packages(exclude=["contrib", "docs", "tests*"]),
+    package_data={
+        'pip._vendor.requests': ['*.pem'],
+        'pip._vendor.distlib._backport': ['sysconfig.cfg'],
+        'pip._vendor.distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
+    },
+    entry_points={
+        "console_scripts": [
+            "pip=pip:main",
+            "pip%s=pip:main" % sys.version[:1],
+            "pip%s=pip:main" % sys.version[:3],
+        ],
+    },
+    tests_require=tests_require,
+    zip_safe=False,
+    extras_require={
+        'testing': tests_require,
+    },
+    cmdclass={'test': PyTest},
 )

tests/conftest.py

@@ -40,7 +40,9 @@ def virtualenv(tmpdir, monkeypatch):
     # Copy over our source tree so that each virtual environment is self
     # contained
     pip_src = tmpdir.join("pip_src").abspath
-    shutil.copytree(SRC_DIR, pip_src,
+    shutil.copytree(
+        SRC_DIR,
+        pip_src,
         ignore=shutil.ignore_patterns(
             "*.pyc", "tests", "pip.egg-info", "build", "dist", ".tox",
         ),

tests/functional/test_bundle.py

@@ -1,6 +1,6 @@
 import zipfile
 import textwrap
-from os.path import abspath, exists, join
+from os.path import exists, join
 from pip.download import path_to_url
 from tests.lib.local_repos import local_checkout
 
@@ -14,13 +14,27 @@ def test_create_bundle(script, tmpdir, data):
     """
     fspkg = path_to_url(data.packages/'FSPkg')
     script.pip('install', '-e', fspkg)
-    pkg_lines = textwrap.dedent('''\
+    pkg_lines = textwrap.dedent(
+        '''
             -e %s
             -e %s#egg=initools-dev
-            pip''' % (fspkg, local_checkout('svn+http://svn.colorstudy.com/INITools/trunk', tmpdir.join("cache"))))
+            pip
+        ''' %
+        (
+            fspkg,
+            local_checkout(
+                'svn+http://svn.colorstudy.com/INITools/trunk',
+                tmpdir.join("cache"),
+            ),
+        ),
+    )
     script.scratch_path.join("bundle-req.txt").write(pkg_lines)
     # Create a bundle in env.scratch_path/ test.pybundle
-    result = script.pip('bundle', '--no-use-wheel', '-r', script.scratch_path/ 'bundle-req.txt', script.scratch_path/ 'test.pybundle')
+    result = script.pip(
+        'bundle', '--no-use-wheel', '-r',
+        script.scratch_path / 'bundle-req.txt',
+        script.scratch_path / 'test.pybundle',
+    )
     bundle = result.files_after.get(join('scratch', 'test.pybundle'), None)
     assert bundle is not None
 
@@ -32,14 +46,20 @@ def test_create_bundle(script, tmpdir, data):
 
 def test_cleanup_after_create_bundle(script, tmpdir, data):
     """
-    Test clean up after making a bundle. Make sure (build|src)-bundle/ dirs are removed but not src/.
+    Test clean up after making a bundle. Make sure (build|src)-bundle/ dirs are
+    removed but not src/.
 
     """
     # Install an editable to create a src/ dir.
     args = ['install']
-    args.extend(['-e',
-                 '%s#egg=pip-test-package' %
-                    local_checkout('git+http://github.com/pypa/pip-test-package.git', tmpdir.join("cache"))])
+    args.extend([
+        '-e',
+        '%s#egg=pip-test-package' %
+        local_checkout(
+            'git+http://github.com/pypa/pip-test-package.git',
+            tmpdir.join("cache"),
+        ),
+    ])
     script.pip(*args)
     build = script.venv_path/"build"
     src = script.venv_path/"src"
@@ -48,16 +68,32 @@ def test_cleanup_after_create_bundle(script, tmpdir, data):
 
     # Make the bundle.
     fspkg = path_to_url(data.packages/'FSPkg')
-    pkg_lines = textwrap.dedent('''\
+    pkg_lines = textwrap.dedent(
+        '''
             -e %s
             -e %s#egg=initools-dev
-            pip''' % (fspkg, local_checkout('svn+http://svn.colorstudy.com/INITools/trunk', tmpdir.join("cache"))))
+            pip
+        ''' %
+        (
+            fspkg,
+            local_checkout(
+                'svn+http://svn.colorstudy.com/INITools/trunk',
+                tmpdir.join("cache"),
+            ),
+        ),
+    )
     script.scratch_path.join("bundle-req.txt").write(pkg_lines)
-    script.pip('bundle', '--no-use-wheel', '-r', 'bundle-req.txt', 'test.pybundle')
+    script.pip(
+        'bundle', '--no-use-wheel', '-r', 'bundle-req.txt', 'test.pybundle',
+    )
     build_bundle = script.scratch_path/"build-bundle"
     src_bundle = script.scratch_path/"src-bundle"
-    assert not exists(build_bundle), "build-bundle/ dir still exists: %s" % build_bundle
-    assert not exists(src_bundle), "src-bundle/ dir still exists: %s" % src_bundle
+    assert not exists(build_bundle), (
+        "build-bundle/ dir still exists: %s" % build_bundle
+    )
+    assert not exists(src_bundle), "src-bundle/ dir still exists: %s" % (
+        src_bundle
+    )
     script.assert_no_temp()
 
     # Make sure previously created src/ from editable still exists

tests/functional/test_completion.py

@@ -62,8 +62,10 @@ def setup_completion(script, words, cword):
     script.environ['COMP_CWORD'] = cword
 
     # expect_error is True because autocomplete exists with 1 status code
-    result = script.run('python', '-c', 'import pip;pip.autocomplete()',
-            expect_error=True)
+    result = script.run(
+        'python', '-c', 'import pip;pip.autocomplete()',
+        expect_error=True,
+    )
 
     return result, script