From 9b2a8c4f6fd2e4085593e54a99d924b7b937fd41 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Tue, 1 Sep 2020 14:47:03 +0200
Subject: [PATCH] Try to fix Gitlab CI

---
 .gitlab-ci.yml | 14 +++++++++-----
 tox.ini        |  8 ++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d28c037..49c83a05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,28 @@
-image: python:3.8
+image: debian:buster-backports
 
 stages:
   - test
   - quality-assurance
 
 before_script:
-  - pip install tox
+  # We do not include uwsgi and LaTeX here
+  - apt-get update && \
+    apt-get install -t buster-backports -y python3-django python3-django-crispy-forms \
+    python3-django-extensions python3-django-filters python3-django-polymorphic \
+    python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil \
+    python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
+    gettext libjs-bootstrap4 fonts-font-awesome tox && \
+    rm -rf /var/lib/apt/lists/*
 
 py37-django22:
-  image: python:3.7
   stage: test
   script: tox -e py37-django22
 
 py38-django22:
-  image: python:3.8
   stage: test
   script: tox -e py38-django22
 
 linters:
-  image: python:3.8
   stage: quality-assurance
   script: tox -e linters
 
diff --git a/tox.ini b/tox.ini
index 14a05064..dd3e4b50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,9 +13,7 @@ skipsdist = True
 setenv =
 	PYTHONWARNINGS = all
 deps =
-    -r{toxinidir}/requirements/base.txt
-    -r{toxinidir}/requirements/cas.txt
-    -r{toxinidir}/requirements/production.txt
+    -r{toxinidir}/requirements.txt
     coverage
 commands =
     ./manage.py makemigrations
@@ -24,9 +22,7 @@ commands =
 
 [testenv:linters]
 deps =
-    -r{toxinidir}/requirements/base.txt
-    -r{toxinidir}/requirements/cas.txt
-    -r{toxinidir}/requirements/production.txt
+    -r{toxinidir}/requirements.txt
     flake8
     flake8-colors
     flake8-import-order