Updated test matrix to test against Django 5.2 explicitly (#1441)

* Updated test matrix to test against Django 5.2 explicitly

* Apply suggestions from code review

Co-authored-by: Anders <[email protected]>

* Some extra changes for supporting Django 5.2

---------

Co-authored-by: Anders <[email protected]>

Author: tim-schilling

.github/workflows/test.yml

@@ -12,15 +12,22 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
-        django-version: ['4.2', '5.0', '5.1', 'main']
+        django-version: ['4.2', '5.0', '5.1', '5.2', 'main']
 
         exclude:
-          # Exclude py3.9 for Django main and 5+
+          # Exclude py3.9 for Django >= 5.0,
+          # and py3.10 and py3.11 for Django > 5.2
           - python-version: '3.9'
             django-version: '5.0'
           - python-version: '3.9'
             django-version: '5.1'
           - python-version: '3.9'
+            django-version: '5.2'
+          - python-version: '3.9'
+            django-version: 'main'
+          - python-version: '3.10'
+            django-version: 'main'
+          - python-version: '3.11'
             django-version: 'main'
 
     services:

CHANGES.rst

@@ -15,6 +15,7 @@ Unreleased
 - Added pagination to ``SimpleHistoryAdmin`` (gh-1277)
 - Fixed issue with history button not working when viewing historical entries in the
   admin (gh-527)
+- Added support for Django 5.2 (gh-1441)
 
 3.7.0 (2024-05-29)
 ------------------

README.rst

@@ -48,7 +48,8 @@ This app supports the following combinations of Django and Python:
 4.2         3.9, 3.10, 3.11, 3.12, 3.13
 5.0         3.10, 3.11, 3.12, 3.13
 5.1         3.10, 3.11, 3.12, 3.13
-main        3.10, 3.11, 3.12, 3.13
+5.2         3.10, 3.11, 3.12, 3.13
+main        3.12, 3.13
 ==========  ========================
 
 Getting Help

docs/index.rst

@@ -44,7 +44,8 @@ This app supports the following combinations of Django and Python:
 4.2         3.9, 3.10, 3.11, 3.12, 3.13
 5.0         3.10, 3.11, 3.12, 3.13
 5.1         3.10, 3.11, 3.12, 3.13
-main        3.10, 3.11, 3.12, 3.13
+5.2         3.10, 3.11, 3.12, 3.13
+main        3.12, 3.13
 ==========  =======================
 
 Contribute

pyproject.toml

@@ -22,6 +22,8 @@ classifiers = [
   "Framework :: Django",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
+  "Framework :: Django :: 5.1",
+  "Framework :: Django :: 5.2",
   "Intended Audience :: Developers",
   "License :: OSI Approved :: BSD License",
   "Programming Language :: Python",

tox.ini

@@ -1,7 +1,8 @@
 [tox]
 envlist =
     py{39,310,311,312,313}-dj42-{sqlite3,postgres,mysql,mariadb},
-    py{310,311,312,313}-dj{50,51,main}-{sqlite3,postgres,mysql,mariadb},
+    py{310,311,312,313}-dj{50,51,52}-{sqlite3,postgres,mysql,mariadb},
+    py{312,313}-dj{main}-{sqlite3,postgres,mysql,mariadb},
     docs,
     lint
 
@@ -18,6 +19,7 @@ DJANGO =
     4.2: dj42
     5.0: dj50
     5.1: dj51
+    5.2: dj52
     main: djmain
 
 [flake8]
@@ -32,6 +34,7 @@ deps =
     dj42: Django>=4.2,<4.3
     dj50: Django>=5.0,<5.1
     dj51: Django>=5.1,<5.2
+    dj52: Django>=5.2a1,<5.3  # Use a1 to allow testing of the release candidates
     djmain: https://github.com/django/django/tarball/main
     postgres: -rrequirements/postgres.txt
     mysql: -rrequirements/mysql.txt