From 06d3211abe36af81ec5540e187dc4081dab2c013 Mon Sep 17 00:00:00 2001
From: Phil Starkey <philipstarkey@users.noreply.github.com>
Date: Thu, 18 Apr 2024 17:22:08 +1000
Subject: [PATCH] Update CI to run on currently supported Python/Django
 versions

---
 .github/workflows/ci.yml | 24 +++++++++++++-----------
 tox.ini                  | 12 +++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30aa87b..d4f02ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,22 +13,24 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.6"
-          - "3.7"
           - "3.8"
           - "3.9"
-          - "pypy-3.6"
-          - "pypy-3.7"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "pypy-3.9"
+          - "pypy-3.10"
         tox-env:
-          - "dj22" # LTS
-          - "dj31"
-          - "dj32" # LTS
+          - "dj42" # LTS
+          - "dj50"
         exclude:
-          # Python 3.9 is compatible with Django 3.1+
+          # Python 3.8/3.9 is incompatible with Django 5.0+
+          - python-version: "3.8"
+            tox-env: "dj50"
           - python-version: "3.9"
-            tox-env: "dj22"
-          - python-version: "3.9"
-            tox-env: "dj30"
+            tox-env: "dj50"
+          - python-version: "pypy-3.9"
+            tox-env: "dj50"
 
     env:
       TOXENV: ${{ matrix.tox-env }}
diff --git a/tox.ini b/tox.ini
index 6e832a5..f0152f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,13 +4,12 @@
 # By moving it out of the way (~500MB), we trim test execution time by > 80%.
 toxworkdir = {homedir}/.toxenvs/django-click
 envlist =
-    dj{22,31,32},flake8
+    dj{42,50},flake8
 
 [gh-actions]
 django =
-    2.2: dj22
-    3.1: dj31
-    3.2: dj32
+    4.2: dj42
+    5.0: dj50
 
 [testenv]
 usedevelop = true
@@ -20,9 +19,8 @@ setenv =
     PYTHONPATH={toxinidir}/djclick/test/testprj
 deps =
     -rrequirements-test.txt
-    dj22: django>=2.2,<2.3
-    dj31: django>=3.1,<3.2
-    dj32: django>=3.2,<3.3
+    dj42: django>=4.2,<4.3
+    dj50: django>=5.0,<5.1
 commands = py.test -rxs --cov-report= --cov-append --cov djclick {posargs:djclick}