diff options
| author | Tristan Maat <tristan.maat@codethink.co.uk> | 2018-02-08 18:15:13 +0000 |
|---|---|---|
| committer | Tristan Maat <tristan.maat@codethink.co.uk> | 2018-02-08 18:19:13 +0000 |
| commit | 9ab3274393bda6c25e27c84210a97444cd4d4be4 (patch) | |
| tree | 8279c17b9ef8aa1cd1806e524fed18b01c5fdb2f | |
| parent | 6044a88a398a8603013c2324056336f6727e738a (diff) | |
| download | buildstream-239-use-pylint-for-linting.tar.gz | |
Fix bugs and style issues with pylint239-use-pylint-for-linting
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | buildstream/_pipeline.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 953ede75e..ca297a409 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,10 +72,7 @@ linting: variables: PYTEST_ADDOPTS: "--color=yes" script: - - cd dist && ./unpack.sh && cd buildstream - python3 setup.py test --addopts '--no-cov --pylint --pep8 -m "pep8 or pylint"' - dependencies: - - source_dist # Run premerge commits # diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py index 9ce97cea3..85c3574ff 100644 --- a/buildstream/_pipeline.py +++ b/buildstream/_pipeline.py @@ -687,7 +687,7 @@ class Pipeline(): if workspace_dir is None: raise PipelineError("Workspace '{}' is currently not defined" - .format(target.name + " - " + str(source_index))) + .format(target.name)) self.close_workspace(True) |