From 2543566866dde814fca425bd8312f6e73ae756f4 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 8 Jun 2021 18:31:51 +0200
Subject: [PATCH] [ci] #103: Change .gitlab-ci.yml and rm make test rule
Install dev dependencies into the tests jobs to install pytest
Remove `test` rule from the Makefile
---
.gitlab-ci.yml | 4 ++--
Makefile | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7332c6a7..42899299 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,8 +78,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 8d82da68..b0adaf6e 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
--
GitLab