diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c885e5f20a36122d78150dcd6341ce2b2a80e6f..e831c7b91b76aa947a0f8e9f9207188321556fa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,5 +30,4 @@ test-backend: DJANGO_SETTINGS_MODULE: "metagenedb.settings-gitlab-ci" script: - flake8 --max-line-length 120 - - coverage run --source='.' scripts/manage.py test metagenedb/tests - - coverage report + - pytest --cov . diff --git a/backend/metagenedb/tests/apps/accounts/test_auth.py b/backend/metagenedb/apps/accounts/test_auth.py similarity index 100% rename from backend/metagenedb/tests/apps/accounts/test_auth.py rename to backend/metagenedb/apps/accounts/test_auth.py diff --git a/backend/requirements_dev.txt b/backend/requirements_dev.txt index 5e56a93721a88b4246815297e4a931470d446324..01571fc5b59e2927ca0a660d8f447e6e45895405 100644 --- a/backend/requirements_dev.txt +++ b/backend/requirements_dev.txt @@ -5,7 +5,9 @@ Django==2.2.1 django-cors-headers==3.0.2 django-environ==0.4.5 django-extensions==2.1.7 +django-filter==2.1.0 djangorestframework==3.9.4 +djangorestframework-jwt==1.11.0 entrypoints==0.3 flake8==3.7.7 importlib-metadata==0.18 @@ -17,9 +19,11 @@ psycopg2==2.8.2 py==1.8.0 pycodestyle==2.5.0 pyflakes==2.1.1 +PyJWT==1.7.1 pyparsing==2.4.0 pytest==4.6.3 pytest-cov==2.7.1 +pytest-django==3.5.0 pytz==2019.1 six==1.12.0 sqlparse==0.3.0