From 19e64a2b8e9a168dabda190a7c0aa8d0a5335114 Mon Sep 17 00:00:00 2001
From: Adam Johnson <me@adamj.eu>
Date: Wed, 25 Oct 2023 11:42:21 +0100
Subject: [PATCH] Add Django 5.0 support

---
 .github/workflows/test.yml | 30 ++++++++++++++++++++++--------
 setup.py                   |  1 +
 tox.ini                    |  4 ++++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 90ec231..e961fc9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,8 +10,18 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.10']
-        django-version: ['2.2', '3.2', '4.0', '4.1', '4.2']
+        python-version:
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        - '3.11'
+        - '3.12'
+        - 'pypy-3.10'
+        django-version:
+        - '3.2'
+        - '4.1'
+        - '4.2'
+        - '5.0'
         include:
           # Tox configuration for QA environment
           - python-version: '3.11'
@@ -27,12 +37,16 @@ jobs:
             django-version: 'main'
             experimental: true
         exclude:
-          # Exclude Django 2.2 for Python 3.10
-          - python-version: '3.10'
-            django-version: '2.2'
-          # Exclude Django 2.2 for Python 3.11
-          - python-version: '3.11'
-            django-version: '2.2'
+          - python-version: '3.12'
+            django-version: '3.2'
+          - python-version: '3.12'
+            django-version: '4.1'
+          - python-version: '3.12'
+            django-version: '4.2'
+          - python-version: '3.8'
+            django-version: '5.0'
+          - python-version: '3.9'
+            django-version: '5.0'
 
     steps:
     - uses: actions/checkout@v2
diff --git a/setup.py b/setup.py
index bc33c43..65fc804 100755
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.1",
         "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python",
diff --git a/tox.ini b/tox.ini
index 2899821..4c2324b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist =
     py{38,39,310,311,py3}-dj32
     py{38,39,310,311,py3}-dj41
     py{38,39,310,311,py3}-dj42
+    py{310,311,312,py3}-dj50
     py{310,311,py3}-djmain
     py311-djqa
 
@@ -12,6 +13,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
     pypy-3.10: pypy3
 
 [gh-actions:env]
@@ -19,6 +21,7 @@ DJANGO =
     3.2: dj32
     4.1: dj41
     4.2: dj42
+    5.0: dj50
     main: djmain
     qa: djqa
 
@@ -28,6 +31,7 @@ deps =
     dj32: django>=3.2,<3.3
     dj41: django>=4.1,<4.2
     dj42: django>=4.2,<4.3
+    dj50: django>=5.0a1,<5.1
     djmain: https://github.com/django/django/archive/main.tar.gz
 usedevelop = True
 setenv =