aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorDaniel Schadt <kingdread@gmx.de>2022-12-09 21:07:20 +0100
committerDaniel Schadt <kingdread@gmx.de>2022-12-09 21:15:05 +0100
commit5ab50deb4c784e8c07e8600a4a95aafb3b146f75 (patch)
tree7edb911822b9cc6bb544291a0503819e4a0ddab4 /.gitlab-ci.yml
parentf919c404ba11886395c4669734cf11a68af4d904 (diff)
downloadfietsboek-5ab50deb4c784e8c07e8600a4a95aafb3b146f75.tar.gz
fietsboek-5ab50deb4c784e8c07e8600a4a95aafb3b146f75.tar.bz2
fietsboek-5ab50deb4c784e8c07e8600a4a95aafb3b146f75.zip
fix tox and poetry interaction
The Poetry FAQ[1] gives some options on how tox and poetry can be used together, since both of them want to do the virtual env managing. Since we mostly want to use tox as a venv manager and to easily run multiple linters, and we want to have poetry do the dependency management, the method of explicitely using `poetry install` seems to be the most reasonable. This means we don't have to generate a requirements.txt file or make duplicated listings of our dependencies in tox.ini. [1]: https://python-poetry.org/docs/master/faq/#is-tox-supported
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e500b7a..3c1dc16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ cache:
before_script:
- python --version # For debugging
- - pip install 'tox<4'
+ - pip install tox
test:
script:
@@ -30,11 +30,7 @@ test-pypy:
lint:
script:
- - tox -e pylint,flake8,black
-
-lint-tests:
- script:
- - tox -e pylint-tests
+ - tox -e pylint,pylint-tests,flake8,black
mypy:
script: