From 7b7a51ec5ff5836af144ed77ceadd6d2233f3182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <kerl@wkerl.me>
Date: Sat, 2 Oct 2021 17:27:50 +0200
Subject: [PATCH 1/3] Bump python and Django versions in CI

---
 .gitlab-ci.yml | 17 ++++++++++++++---
 tox.ini        |  9 +++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b363ccb..65948f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,21 +46,32 @@ python36:
   stage: tests
   script:
     - tox -e py36-django22
-    - tox -e py36-django30
+    - tox -e py36-django31
+    - tox -e py36-django32
 
 python37:
   image: python:3.7
   stage: tests
   script:
     - tox -e py37-django22
-    - tox -e py37-django30
+    - tox -e py37-django31
+    - tox -e py37-django32
 
 python38:
   image: python:3.8
   stage: tests
   script:
     - tox -e py38-django22
-    - tox -e py38-django30
+    - tox -e py38-django31
+    - tox -e py38-django32
+
+python39:
+  image: python:3.9
+  stage: tests
+  script:
+    - tox -e py39-django22
+    - tox -e py39-django31
+    - tox -e py39-django32
 
 # ---
 # Release artifacts
diff --git a/tox.ini b/tox.ini
index 9a5c460..edf6210 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
 envlist =
-  py{35,36,37,38}-django22,
-  py{36,37,38}-django30
+  py{35,36,37,38,39}-django22,
+  py{36,37,38,39}-django{31,32}
 
 [testenv]
 deps =
-  django22: Django==2.2.*
-  django30: Django==3.0.*
+  django22: Django>=2.2.17
+  django31: Django==3.1.*
+  django32: Django==3.2.*
   python-cas
   python-ldap
 commands =

From cec9edba12d690e444402d2836eca2d93bd6bf58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <kerl@wkerl.me>
Date: Fri, 8 Oct 2021 00:03:01 +0200
Subject: [PATCH 2/3] Fix Django version in the django22 tox env

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index edf6210..5173fe0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist =
 
 [testenv]
 deps =
-  django22: Django>=2.2.17
+  django22: Django>=2.2.17,<3
   django31: Django==3.1.*
   django32: Django==3.2.*
   python-cas

From 6ea557e76ad201409d6cd673b3ae06ffd1a18660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <kerl@wkerl.me>
Date: Sun, 10 Oct 2021 17:37:23 +0200
Subject: [PATCH 3/3] Drop python3.5 support

---
 .gitlab-ci.yml | 6 ------
 tox.ini        | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65948f3..5301cf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,12 +35,6 @@ before_script:
   - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq python3-dev libldap2-dev libsasl2-dev
   - pip install tox
 
-python35:
-  image: python:3.5
-  stage: tests
-  script:
-    - tox -e py35-django22
-
 python36:
   image: python:3.6
   stage: tests
diff --git a/tox.ini b/tox.ini
index 5173fe0..71012b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
-  py{35,36,37,38,39}-django22,
-  py{36,37,38,39}-django{31,32}
+  py{36,37,38,39}-django{22,31,32}
 
 [testenv]
 deps =