diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6374c45f4747ea415b13e1c00ee8eaf39c48715e..9c6ce22d132a64595c03f7477e52f3413c28a422 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ variables: DEV_IMAGE_BASE: $CI_REGISTRY_IMAGE/dev-image-base RELEASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG DOCKER_DRIVER: overlay2 + DOCKER_TLS_CERTDIR: "" + # ========================== Build Testing section =========================== # build_test_env: @@ -110,7 +112,7 @@ test_frontend_unit: stage: test dependencies: - build_frontend - tags: + tags: - docker script: - cd frontend/ diff --git a/requirements.dev.txt b/requirements.dev.txt index 43886874ed8bbbd7594ba6882c8bc2e3ced71736..d883c3514056390dc149dac2d9fab97209199061 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,7 +1,7 @@ flake8~=3.6.0 pre-commit~=1.13.0 pytest-cov~=2.6.0 -pytest-django~=3.4.0 +pytest-django~=3.5.0 selenium~=3.141.0 factory-boy~=2.11.0 Faker~=1.0.0 diff --git a/requirements.txt b/requirements.txt index 39aaeba430ef4ddc5c604f36c3f05011e327f611..466c9ca6e2a019a234175da1c2310d7ee6405d64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ django-cors-headers~=2.4.0 django-extensions~=2.1 djangorestframework-jwt~=1.11.0 -djangorestframework~=3.8 -git+https://github.com/robinhundt/djangorestframework-camel-case -Django~=2.1 +djangorestframework>=3.9, <3.10 +git+https://gitlab.gwdg.de/grady-corp/djangorestframework-camel-case.git +Django>=2.1, <2.2 drf-yasg~=1.12.0 gunicorn~=19.9.0 psycopg2-binary~=2.7.0