diff options
-rw-r--r-- | .gitlab-ci.yml | 7 | ||||
-rw-r--r-- | setup.cfg | 2 |
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: @@ -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 |