summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-03-16 19:10:29 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-03-16 19:10:29 +0900
commit14bb2356a918cecf1b07835af93a045c45e965ba (patch)
treef79e28cbe34623f9bef9ad5c9f6a9ba288a928d4
parentc187ab76168a5f5a3412350bd81d9e4c88c70b7e (diff)
downloadbuildstream-tristan/auto-lint-pep8.tar.gz
Make pylint and pep8 tests run by default.tristan/auto-lint-pep8
This re-enables the linter tests to run by default when running `./setup.py test` on the command line, and removes the additional CI job for linting tests. It is more important that developers find errors quickly and avoid wasting time pushing untested branches to CI, than it is nice to have a separate test in CI to view linting errors - if we can have both, we can re-enable that later without changing the default for the developer running tests locally.
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--setup.cfg2
2 files changed, 1 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2244de3d7..26e4f2227 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,13 +64,6 @@ source_dist:
# Test stage #
#####################################################
-linting:
- stage: test
- variables:
- PYTEST_ADDOPTS: "--color=yes"
- script:
- - python3 setup.py test --addopts '--no-cov --pylint --pep8 -m "pep8 or pylint"'
-
# Run premerge commits
#
linux-tests:
diff --git a/setup.cfg b/setup.cfg
index 4540ae9f3..e88c48572 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
test=pytest
[tool:pytest]
-addopts = --verbose --basetemp ./tmp --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc
+addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc
norecursedirs = integration-cache tmp __pycache__ .eggs
python_files = tests/*/*.py
pep8maxlinelength = 119