From 503b305299fe66f9b84195312049b48962b6337e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Tue, 10 Oct 2017 18:34:18 +0200 Subject: [PATCH 1/3] djangorestframework 3.7 breaks with Django 1.8 JSONField doesn't exist in Django 1.8 --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index f3964212..1591656d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,5 +26,8 @@ python-dateutil wagtail==1.10.* wagtailmenus==2.2.* +# Remove this when we switch to Django 1.11 +djangorestframework==3.6.4 + # Production tools wheel From 3f6c5be74836e325a5f6d8ee16e9499ba358c305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Tue, 10 Oct 2017 21:27:15 +0200 Subject: [PATCH 2/3] Upgrade python packages before testing --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f297cf40..b00817de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ before_script: - sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' cof/settings/secret.py # Remove the old test database if it has not been done yet - psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB" - - pip install --cache-dir vendor/pip -t vendor/python -r requirements.txt + - pip install --upgrade --cache-dir vendor/pip -t vendor/python -r requirements.txt test: stage: test From f4a7e9dbf1c7075f13c7673dba698af76ac42320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Wed, 11 Oct 2017 23:34:43 +0200 Subject: [PATCH 3/3] Verbosity should stay calm. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b00817de..19bcc736 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,4 +38,4 @@ before_script: test: stage: test script: - - python manage.py test -v3 + - python manage.py test