From 946679600201489b4a2f8ea07b359cca3a6e50c7 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sun, 16 Oct 2022 21:07:48 +0200
Subject: [PATCH] Update travis-ci: add new Django version and remove dropped
 versions

---
 .travis.yml | 30 ++++++++++--------------------
 tox.ini     | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c39d04..34acddb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,30 +8,12 @@ matrix:
     env: TOX_ENV=check_rst
   - python: "3.9"
     env: TOX_ENV=coverage
-  # Debian strech support
-  - python: "3.5"
-    env: TOX_ENV=py35-django111
-  - python: "3.5"
-    env: TOX_ENV=py35-django111
-    arch: ppc64le
-  # Ubuntu bionic and EPEL 7 support
-  - python: "3.6"
-    env: TOX_ENV=py36-django111
-  - python: "3.6"
-    env: TOX_ENV=py36-django111
-    arch: ppc64le
   # RHEL 8 support
   - python: "3.6"
     env: TOX_ENV=py36-django22
   - python: "3.6"
     env: TOX_ENV=py36-django22
     arch: ppc64le
-  # Debian buster support
-  - python: "3.7"
-    env: TOX_ENV=py37-django111
-  - python: "3.7"
-    env: TOX_ENV=py37-django111
-    arch: ppc64le
   # Ubuntu focal and Ubuntu groovy support
   - python: "3.8"
     env: TOX_ENV=py38-django22
@@ -44,11 +26,19 @@ matrix:
   - python: "3.9"
     env: TOX_ENV=py39-django22
     arch: ppc64le
+  # Ubuntu jammy support
+  - python: "3.10"
+    env: TOX_ENV=py310-django32
+  - python: "3.10"
+    env: TOX_ENV=py310-django32
+    arch: ppc64le
   # Django additional supported version
-  - python: "3.9"
-    env: TOX_ENV=py39-django31
   - python: "3.9"
     env: TOX_ENV=py39-django32
+  - python: "3.10"
+    env: TOX_ENV=py310-django40
+  - python: "3.10"
+    env: TOX_ENV=py310-django41
 
 cache:
   directories:
diff --git a/tox.ini b/tox.ini
index b2a411b..befd910 100644
--- a/tox.ini
+++ b/tox.ini
@@ -189,6 +189,17 @@ deps =
     Django>=2.2,<3.0
     {[base]deps}
 
+########################
+# Ubuntu jammy support #
+########################
+
+[testenv:py310-django32]
+basepython=python3.10
+deps =
+    Django>=3.2,<3.3
+    {[base]deps}
+
+
 #######################################
 # Django additional supported version #
 #######################################
@@ -205,3 +216,15 @@ basepython=python3.9
 deps =
     Django>=3.2,<3.3
     {[base]deps}
+
+[testenv:py310-django40]
+basepython=python3.10
+deps =
+    Django>=4.0,<4.1
+    {[base]deps}
+
+[testenv:py310-django41]
+basepython=python3.10
+deps =
+    Django>=4.1,<4.2
+    {[base]deps}