From ba9cfaf1dc6d98c66d61869b6b035b413b92bde2 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Tue, 26 Jan 2021 14:53:51 +0100
Subject: [PATCH] Update test environment, don't test anymore with Django 2.0
 and Django 2.1

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 .gitlab-ci.yml | 159 +++++++++++++++++++++++--------------------------
 .travis.yml    |   6 +-
 2 files changed, 79 insertions(+), 86 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cffb395..0394afa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ before_script:
 - pip install tox setuptools
 
 flake8:
-  image: "python:2.7"
+  image: "python:3.9"
   cache:
     key: flake8
     paths:
@@ -11,7 +11,7 @@ flake8:
   - tox -e flake8
 
 check_rst:
-  image: "python:2.7"
+  image: "python:3.9"
   cache:
     key: check_rst
     paths:
@@ -19,107 +19,98 @@ check_rst:
   script:
   - tox -e check_rst
 
-py27-django17:
+py27-django111:
   image: "python:2.7"
   cache:
-    key: py27-django17
+    key: py27-django111
     paths:
-    - .tox/py27-django17
+    - .tox/py27-django111
   script:
-  - tox -e py27-django17
+  - tox -e py27-django111
 
-py27-django18:
-  image: "python:2.7"
-  cache:
-    key: py27-django18
-    paths:
-    - .tox/py27-django18
-  script:
-  - tox -e py27-django18
-
-py27-django19:
-  image: "python:2.7"
-  cache:
-    key: py27-django19
-    paths:
-    - .tox/py27-django19
-  script:
-  - tox -e py27-django19
-
-py27-django110:
-  image: "python:2.7"
-  cache:
-    key: py27-django110
-    paths:
-    - .tox/py27-django110
-  script:
-  - tox -e py27-django110
-
-py34-django17:
-  image: "python:3.4"
-  cache:
-    key: py34-django17
-    paths:
-    - .tox/py34-django17
-  script:
-  - tox -e py34-django17
-
-py34-django18:
-  image: "python:3.4"
-  cache:
-    key: py34-django18
-    paths:
-    - .tox/py34-django18
-  script:
-  - tox -e py34-django18
-
-py34-django19:
-  image: "python:3.4"
-  cache:
-    key: py34-django19
-    paths:
-    - .tox/py34-django19
-  script:
-  - tox -e py34-django19
-
-py34-django110:
-  image: "python:3.4"
-  cache:
-    key: py34-django110
-    paths:
-    - .tox/py34-django110
-  script:
-  - tox -e py34-django110
-
-py35-django18:
+py35-django111:
   image: "python:3.5"
   cache:
-    key: py35-django18
+    key: py35-django111
     paths:
-    - .tox/py35-django18
+    - .tox/py35-django111
   script:
-  - tox -e py35-django18
+  - tox -e py35-django111
 
-py35-django19:
-  image: "python:3.5"
+py36-django111:
+  image: "python:3.6"
   cache:
-    key: py35-django19
+    key: py36-django111
     paths:
-    - .tox/py35-django19
+    - .tox/py36-django111
   script:
-  - tox -e py35-django19
+  - tox -e py36-django111
 
-py35-django110:
-  image: "python:3.5"
+py37-django22:
+  image: "python:3.7"
   cache:
-    key: py35-django110
+    key: py37-django22
     paths:
-    - .tox/py35-django110
+    - .tox/py37-django22
   script:
-  - tox -e py35-django110
+  - tox -e py37-django22
+
+py38-django22:
+  image: "python:3.8"
+  cache:
+    key: py38-django22
+    paths:
+    - .tox/py38-django22
+  script:
+  - tox -e py38-django22
+
+py38-django30:
+  image: "python:3.8"
+  cache:
+    key: py38-django30
+    paths:
+    - .tox/py38-django30
+  script:
+  - tox -e py38-django30
+
+py38-django31:
+  image: "python:3.8"
+  cache:
+    key: py38-django31
+    paths:
+    - .tox/py38-django31
+  script:
+  - tox -e py38-django31
+
+py39-django22:
+  image: "python:3.9"
+  cache:
+    key: py39-django22
+    paths:
+    - .tox/py39-django22
+  script:
+  - tox -e py39-django22
+
+py39-django30:
+  image: "python:3.9"
+  cache:
+    key: py39-django30
+    paths:
+    - .tox/py39-django30
+  script:
+  - tox -e py39-django30
+
+py39-django31:
+  image: "python:3.9"
+  cache:
+    key: py39-django31
+    paths:
+    - .tox/py39-django31
+  script:
+  - tox -e py39-django31
 
 coverage:
-  image: "python:2.7"
+  image: "python:3.9"
   cache:
     key: coverage
     paths:
diff --git a/.travis.yml b/.travis.yml
index ca142f3..cd7a9bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: python
 matrix:
   include:
-  - python: "3.8"
+  - python: "3.9"
     env: TOX_ENV=flake8
-  - python: "3.8"
+  - python: "3.9"
     env: TOX_ENV=check_rst
   - python: "2.7"
     env: TOX_ENV=py27-django111
@@ -19,6 +19,8 @@ matrix:
     env: TOX_ENV=py38-django30
   - python: "3.8"
     env: TOX_ENV=py38-django31
+  - python: "3.9"
+    env: TOX_ENV=py39-django22
   - python: "3.9"
     env: TOX_ENV=py39-django30
   - python: "3.9"