From 1e8dc52fd078f1b6520c7a63d173c1ee2c83dff0 Mon Sep 17 00:00:00 2001
From: Jan Malte Gerth <mail@malte-gerth.de>
Date: Thu, 20 Jul 2023 19:25:20 +0200
Subject: [PATCH 1/2] ci: remove unsupported python versions from github
 actions

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 39d24e6..5a9d747 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,11 +6,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v1

From eced83f368c5cf066c39798e332fc5f42ae472a5 Mon Sep 17 00:00:00 2001
From: Jan Malte Gerth <mail@malte-gerth.de>
Date: Thu, 20 Jul 2023 17:46:11 +0000
Subject: [PATCH 2/2] chore: fix tox config to pass env

---
 tox.ini | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tox.ini b/tox.ini
index a944a14..753e206 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
-envlist = py{27,35,36}-django{18,19,110,111}
-    py{35,36,37,38}-django{111,20}
+envlist =
+    py{27,35,36}-django{18,19,110,111}
+    py{35,36,37,38}-django{111,22}
     py{36,37,38,39,310}-django{30,31,32}
     py{38,39,310}-django{40,41}
 [testenv]
@@ -15,16 +16,16 @@ deps =
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
-    django20: Django >=2.0.0,<3.0.0
-    django30: Django >=3.0,<3.1
-    django31: Django >=3.1,<3.2
-    django32: Django >=3.2
-    django40: Django >=4.0,<4.1
-    django41: Django ==4.1a1
+    django22: Django>=2.2,<2.3
+    django30: Django>=3.0,<3.1
+    django31: Django>=3.1,<3.2
+    django32: Django>=3.2,<3.3
+    django40: Django>=4.0,<4.1
+    django41: Django>=4.1,<4.2
 setenv =
     PIP_ALLOW_EXTERNAL=true
     DJANGO_SETTINGS_MODULE=session_security.tests.project.settings
-passenv = CI DISPLAY DBDIFF_* TEST_* TOX_* SAUCE_*
+passenv = CI,DISPLAY,DBDIFF_*,TEST_*,TOX_*,SAUCE_*
 
 [testenv:checkqa]
 basepython = python2.7
@@ -35,10 +36,6 @@ deps =
 
 [gh-actions]
 python =
-    2.7: py27
-    3.5: py35
-    3.6: py36
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310