diff options
| author | Javier Jardón <jjardon@gnome.org> | 2018-08-10 23:39:31 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2018-09-13 08:22:38 +0100 |
| commit | 501060b3206a9806e7656b8345301ba89ae2c2f1 (patch) | |
| tree | dd5281904afa70c3a77bff6f1cd92655f4149521 | |
| parent | b3ffcdc8fcc8d150cf6d75acbc660379b3fc0fcb (diff) | |
| download | buildstream-501060b3206a9806e7656b8345301ba89ae2c2f1.tar.gz | |
Use pycodestyle instead pep8
pep8 package was renamed to pycodestyle to reduce confusion.
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | buildstream/_ostree.py | 2 | ||||
| -rw-r--r-- | buildstream/element.py | 2 | ||||
| -rw-r--r-- | dev-requirements.txt | 3 | ||||
| -rw-r--r-- | setup.cfg | 16 |
5 files changed, 11 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d57d33f83..e963f1ee7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,25 +84,25 @@ source_dist: - coverage-linux/ tests-debian-9: - image: buildstream/testsuite-debian:9-master-117-aa3a33b3 + image: buildstream/testsuite-debian:9-master-117-b3ffcdc8 <<: *linux-tests tests-fedora-27: - image: buildstream/testsuite-fedora:27-master-117-aa3a33b3 + image: buildstream/testsuite-fedora:27-master-117-b3ffcdc8 <<: *linux-tests tests-fedora-28: - image: buildstream/testsuite-fedora:28-master-117-aa3a33b3 + image: buildstream/testsuite-fedora:28-master-117-b3ffcdc8 <<: *linux-tests tests-ubuntu-18.04: - image: buildstream/testsuite-ubuntu:18.04-master-117-aa3a33b3 + image: buildstream/testsuite-ubuntu:18.04-master-117-b3ffcdc8 <<: *linux-tests tests-unix: # Use fedora here, to a) run a test on fedora and b) ensure that we # can get rid of ostree - this is not possible with debian-8 - image: buildstream/testsuite-fedora:27-master-117-aa3a33b3 + image: buildstream/testsuite-fedora:27-master-117-b3ffcdc8 stage: test variables: BST_FORCE_BACKEND: "unix" 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/element.py b/buildstream/element.py index 553973d0c..804dc5a89 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -1528,7 +1528,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() diff --git a/dev-requirements.txt b/dev-requirements.txt index c88b4c723..7b5748b66 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,11 +1,10 @@ coverage == 4.4.0 -pep8 pylint == 2.1.1 pytest >= 3.7 +pytest-codestyle >= 1.3.0 pytest-cov >= 2.5.0 pytest-datafiles pytest-env -pytest-pep8 pytest-pylint pytest-xdist pytest-timeout @@ -11,20 +11,10 @@ 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 env = D:BST_TEST_SUITE=True |