buildstream/_ostree.py

@@ -34,7 +34,7 @@ from ._exceptions import BstError, ErrorDomain
 
 # pylint: disable=wrong-import-position,wrong-import-order
 gi.require_version('OSTree', '1.0')
-from gi.repository import GLib, Gio, OSTree  # nopep8
+from gi.repository import GLib, Gio, OSTree  # noqa
 
 
 # For users of this file, they must expect (except) it.

buildstream/_signals.py

@@ -38,7 +38,7 @@ def terminator_handler(signal_, frame):
         terminator_ = terminator_stack.pop()
         try:
             terminator_()
-        except:                                                 # pylint: disable=bare-except
+        except:                                                 # pylint: disable=bare-except # noqa
             # Ensure we print something if there's an exception raised when
             # processing the handlers. Note that the default exception
             # handler won't be called because we os._exit next, so we must

buildstream/element.py

@@ -1519,7 +1519,7 @@ class Element(Plugin):
                 utils._force_rmtree(rootdir)
 
             with _signals.terminator(cleanup_rootdir), \
-                self.__sandbox(rootdir, output_file, output_file, self.__sandbox_config) as sandbox:  # nopep8
+                self.__sandbox(rootdir, output_file, output_file, self.__sandbox_config) as sandbox:  # noqa
 
                 sandbox_vroot = sandbox.get_virtual_directory()
 

buildstream/plugins/sources/tar.py

@@ -127,7 +127,7 @@ class TarSource(DownloadableFileSource):
         if not base_dir.endswith(os.sep):
             base_dir = base_dir + os.sep
 
-        l = len(base_dir)
+        L = len(base_dir)
         for member in tar.getmembers():
 
             # First, ensure that a member never starts with `./`
@@ -145,9 +145,9 @@ class TarSource(DownloadableFileSource):
                 #       base directory.
                 #
                 if member.type == tarfile.LNKTYPE:
-                    member.linkname = member.linkname[l:]
+                    member.linkname = member.linkname[L:]
 
-                member.path = member.path[l:]
+                member.path = member.path[L:]
                 yield member
 
     # We want to iterate over all paths of a tarball, but getmembers()

buildstream/plugins/sources/zip.py

@@ -121,13 +121,13 @@ class ZipSource(DownloadableFileSource):
         if not base_dir.endswith(os.sep):
             base_dir = base_dir + os.sep
 
-        l = len(base_dir)
+        L = len(base_dir)
         for member in archive.infolist():
             if member.filename == base_dir:
                 continue
 
             if member.filename.startswith(base_dir):
-                member.filename = member.filename[l:]
+                member.filename = member.filename[L:]
                 yield member
 
     # We want to iterate over all paths of an archive, but namelist()

buildstream/utils.py

@@ -645,6 +645,7 @@ def _pretty_size(size, dec_places=0):
             psize /= 1024
     return "{size:g}{unit}".format(size=round(psize, dec_places), unit=unit)
 
+
 # A sentinel to be used as a default argument for functions that need
 # to distinguish between a kwarg set to None and an unset kwarg.
 _sentinel = object()

dev-requirements.txt

 coverage == 4.4.0
-pep8
+pycodestyle
 pylint == 2.1.1
 pytest >= 3.7
 pytest-cov >= 2.5.0
 pytest-datafiles
 pytest-env
-pytest-pep8
 pytest-pylint
 pytest-xdist

doc/bst2html.py

@@ -96,8 +96,8 @@ def _ansi2html_get_styles(palette):
 
         for g in range(24):
             i = g + 232
-            l = g * 10 + 8
-            indexed_style['%s' % i] = ''.join('%02X' % c if 0 <= c <= 255 else None for c in (l, l, l))
+            L = g * 10 + 8
+            indexed_style['%s' % i] = ''.join('%02X' % c if 0 <= c <= 255 else None for c in (L, L, L))
 
         _ANSI2HTML_STYLES[palette] = (regular_style, bold_style, indexed_style)
     return _ANSI2HTML_STYLES[palette]
@@ -455,6 +455,7 @@ def run_bst(directory, force, source_cache, description, palette):
 
     return 0
 
+
 if __name__ == '__main__':
     try:
         run_bst()

doc/source/conf.py

@@ -19,10 +19,10 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('..'))
-
 from buildstream import __version__
 
+sys.path.insert(0, os.path.abspath('..'))
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -112,7 +112,7 @@ add_module_names = False
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-modindex_common_prefix = [ 'buildstream.' ]
+modindex_common_prefix = ['buildstream.']
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
 # keep_warnings = False

setup.cfg

@@ -11,20 +11,14 @@ parentdir_prefix = BuildStream-
 test=pytest
 
 [tool:pytest]
-addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --durations=20
+addopts = --verbose --basetemp ./tmp --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --durations=20
 norecursedirs = tests/integration/project integration-cache tmp __pycache__ .eggs
 python_files = tests/*/*.py
-pep8maxlinelength = 119
-pep8ignore =
-    * E129
-    * E125
-    doc/source/conf.py ALL
-    tmp/* ALL
-    */lib/python3* ALL
-    */bin/* ALL
-    buildstream/_fuse/fuse.py ALL
-    .eggs/* ALL
-    *_pb2.py ALL
-    *_pb2_grpc.py ALL
 env =
     D:BST_TEST_SUITE=True
+
+[pycodestyle]
+count = False
+ignore = E129,E125,W504,W605
+exclude = doc/source/conf.py, tmp/*, */lib/python3*, */bin/*, buildstream/_fuse/fuse.py, .eggs/*, *_pb2.py, *_pb2_grpc.py
+max-line-length = 119

tests/cachekey/cachekey.py

@@ -129,6 +129,7 @@ def assert_cache_keys(project_dir, output):
                              "Use tests/cachekey/update.py to automatically " +
                              "update this test case")
 
+
 ##############################################
 #             Test Entry Point               #
 ##############################################

tests/cachekey/update.py

@@ -65,5 +65,6 @@ def update_keys():
 
                 write_expected_key(element_name, actual_keys[element_name])
 
+
 if __name__ == '__main__':
     update_keys()

tests/frontend/buildcheckout.py

@@ -288,6 +288,7 @@ def test_build_checkout_force_tarball(datafiles, cli):
     assert os.path.join('.', 'usr', 'bin', 'hello') in tar.getnames()
     assert os.path.join('.', 'usr', 'include', 'pony.h') in tar.getnames()
 
+
 fetch_build_checkout_combos = \
     [("strict", kind) for kind in ALL_REPO_KINDS] + \
     [("non-strict", kind) for kind in ALL_REPO_KINDS]