diff options
| author | Javier Jardón <jjardon@gnome.org> | 2018-08-10 23:39:31 +0100 |
|---|---|---|
| committer | Tristan Maat <tm@tlater.net> | 2019-01-02 14:29:19 +0100 |
| commit | 0b972bf3bb5f71e4f880e902ef0f5dc2db800d61 (patch) | |
| tree | 79361b8e214f694ceb34b944e064eb7d3a4845f9 | |
| parent | 5dc15c78a1f3475d45d46d5977e669961c4839a4 (diff) | |
| download | buildstream-jjardon/pycodestyle.tar.gz | |
Use pycodestyle instead of pep8jjardon/pycodestyle
pep8 package was renamed to pycodestyle to reduce confusion.
| -rw-r--r-- | buildstream/_ostree.py | 2 | ||||
| -rw-r--r-- | buildstream/_signals.py | 2 | ||||
| -rw-r--r-- | buildstream/element.py | 2 | ||||
| -rw-r--r-- | dev-requirements.txt | 3 | ||||
| -rw-r--r-- | setup.cfg | 17 |
5 files changed, 8 insertions, 18 deletions
diff --git a/buildstream/_ostree.py b/buildstream/_ostree.py index 5a4039f2f..ab652d77c 100644 --- a/buildstream/_ostree.py +++ b/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. diff --git a/buildstream/_signals.py b/buildstream/_signals.py index 0035485a5..2dffc964e 100644 --- a/buildstream/_signals.py +++ b/buildstream/_signals.py @@ -38,7 +38,7 @@ def terminator_handler(signal_, frame): terminator_ = terminator_stack.pop() try: terminator_() - except: # pylint: disable=bare-except + except: # noqa pylint: disable=bare-except # 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 diff --git a/buildstream/element.py b/buildstream/element.py index e0d8ce77d..82fcbaa8a 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -1547,7 +1547,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 # By default, the dynamic public data is the same as the static public data. # The plugin's assemble() method may modify this, though. diff --git a/dev-requirements.txt b/dev-requirements.txt index 1b175c257..2b71008da 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,11 +1,10 @@ coverage == 4.4.0 -pep8 pylint == 2.1.1 pytest >= 3.8 +pytest-codestyle >= 1.4.0 pytest-cov >= 2.5.0 pytest-datafiles pytest-env -pytest-pep8 pytest-pylint pytest-xdist pytest-timeout @@ -11,20 +11,11 @@ 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 --codestyle --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 +codestyle_max_line_length = 119 +codestyle_ignore = E129 E125 +codestyle_exclude = doc/source/conf.py buildstream/_fuse/fuse.py buildstream/_protos/**/*py env = D:BST_TEST_SUITE=True |