From 3256137782364569fe8e77539aafb0053719ea7a Mon Sep 17 00:00:00 2001
From: "robinwilliam.hundt" <robinwilliam.hundt@stud.uni-goettingen.de>
Date: Tue, 6 Aug 2019 17:58:16 +0200
Subject: [PATCH] Fixed dependency issues
---
.gitlab-ci.yml | 4 +++-
requirements.dev.txt | 2 +-
requirements.txt | 6 +++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6374c45f..9c6ce22d 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 43886874..d883c351 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 39aaeba4..466c9ca6 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
--
GitLab