diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e2b09d8084119bc452b047a429d770c709fcfa7..460711572338057d1591b172f6cf08b1dacfed1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,8 +86,8 @@ type: stage: tests image: $DOCKER_IMAGE/$PYTHON_VERSION:latest script: - - poetry install --no-dev - - make tests + - poetry install + - poetry run pytest tests-3.6: extends: .tests diff --git a/Makefile b/Makefile index 8d82da6867c9986f294dd06a906ad3926f83520e..b0adaf6e05ade1a26c07bade13da09ad13bb7483 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,10 @@ -.PHONY: docs tests check check-format mypy pylint format build deploy deploy_test +.PHONY: docs check check-format mypy pylint format build deploy deploy_test .SILENT: deploy deploy_test # do not echo commands with password # generate documentation docs: cd docs && rm duniterpy.*; poetry run sphinx-apidoc -o . ../duniterpy && poetry run make clean && poetry run make html && cd .. -# run tests -tests: - poetry run python3 -m unittest -f ${TESTS_FILTER} - # check check: mypy pylint check-format