summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Maat <tm@tlater.net>2018-03-16 10:04:40 +0000
committerTristan Maat <tm@tlater.net>2018-03-16 10:04:40 +0000
commit7e6b5f26603dc98728e3b5cbcc61275f2f14ff1d (patch)
treed65069daae0b1d597b5e9078d2c50100231c8a7a
parentc187ab76168a5f5a3412350bd81d9e4c88c70b7e (diff)
downloadbuildstream-always-do-linting.tar.gz
Enable linting unconditionallyalways-do-linting
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--setup.cfg2
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2244de3d7..17f41dd56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,7 +88,7 @@ linux-tests:
# Run the tests from the source distribution, We run as a simple
# user to test for permission issues
- - su buildstream -c 'python3 setup.py test --index-url invalid://uri --addopts --integration'
+ - su buildstream -c 'python3 setup.py test --index-url invalid://uri --addopts --integration -m "not (pep8 or pylint)"'
# Go back to the toplevel and collect our reports
- cd ../..
@@ -119,7 +119,7 @@ unix-tests:
- cd dist && ./unpack.sh && cd buildstream
# Since the unix platform is required to run as root, no user change required
- - python3 setup.py test --index-url invalid://uri --addopts --integration
+ - python3 setup.py test --index-url invalid://uri --addopts --integration -m "not (pep8 or pylint)"
# Go back to the toplevel and collect our reports
- cd ../..
diff --git a/setup.cfg b/setup.cfg
index 4540ae9f3..712413b0b 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 --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --pep8 --pylint
norecursedirs = integration-cache tmp __pycache__ .eggs
python_files = tests/*/*.py
pep8maxlinelength = 119