Formalise support for Django 4.1

.github/workflows/test.yml

@@ -23,15 +23,15 @@ concurrency:
 # - django 3.2, python 3.7, postgres
 # - django 3.2, python 3.8, mysql
 # - django 4.0, python 3.9, sqlite
-# - django 4.0, python 3.9, mysql
+# - django 4.1, python 3.9, mysql
 # - django 4.0, python 3.10, postgres, USE_EMAIL_USER_MODEL=yes
-# - django 4.0, python 3.10, postgres, DISABLE_TIMEZONE=yes
+# - django 4.1, python 3.10, postgres, DISABLE_TIMEZONE=yes
 # - django stable/4.1.x, python 3.10, postgres (allow failures)
 # - django main, python 3.10, postgres (allow failures)
 # - elasticsearch 5, django 3.2, python 3.7, sqlite
 # - elasticsearch 6, django 3.2, python 3.7, postgres
 # - elasticsearch 7, django 4.0, python 3.8, postgres
-# - elasticsearch 7, django 4.0, python 3.9, sqlite, USE_EMAIL_USER_MODEL=yes
+# - elasticsearch 7, django 4.1, python 3.9, sqlite, USE_EMAIL_USER_MODEL=yes
 
 jobs:
   test-sqlite:
@@ -69,7 +69,7 @@ jobs:
             django: 'Django>=3.2,<3.3'
             experimental: false
           - python: '3.10'
-            django: 'Django>=4.0,<4.1'
+            django: 'Django>=4.1,<4.2'
             notz: notz
             experimental: false
           - python: '3.10'
@@ -129,7 +129,7 @@ jobs:
             django: 'Django>=3.2,<3.3'
             experimental: false
           - python: '3.9'
-            django: 'Django>=4.0,<4.1'
+            django: 'Django>=4.1,<4.2'
             experimental: false
 
     services:
@@ -210,7 +210,7 @@ jobs:
       matrix:
         include:
           - python: '3.9'
-            django: 'Django>=4.0,<4.1'
+            django: 'Django>=4.1,<4.2'
             emailuser: emailuser
     steps:
       - name: Configure sysctl limits

CHANGELOG.txt

@@ -4,6 +4,7 @@ Changelog
 4.0 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~
 
+ * Added support for Django 4.1
  * Added a new `BaseGenericSetting` base model class that allows defining a settings model that applies to all sites rather than just a single site (Kyle Bayliss)
  * Add clarity to confirmation when being asked to convert an external link to an internal one (Thijs Kramer)
  * Convert the rest of the documentation to Markdown (Khanh Hoang, Vu Pham, Daniel Kirkham, LB (Ben) Johnston, Thiago Costa de Souza, Benedict Faw, Noble Mittal, Sævar Öfjörð Magnússon, Sandeep M A, Stefano Silvestri)

README.md

@@ -87,7 +87,7 @@ _(If you are reading this on GitHub, the details here may not be indicative of t
 
 Wagtail supports:
 
--   Django 3.2.x and 4.0.x
+-   Django 3.2.x, 4.0.x and 4.1.x
 -   Python 3.7, 3.8, 3.9 and 3.10
 -   PostgreSQL, MySQL and SQLite (with JSON1) as database backends
 

docs/getting_started/integrating_into_django.md

@@ -2,7 +2,7 @@
 
 Wagtail provides the `wagtail start` command and project template to get you started with a new Wagtail project as quickly as possible, but it's easy to integrate Wagtail into an existing Django project too.
 
-Wagtail is currently compatible with Django 3.2 and 4.0. First, install the `wagtail` package from PyPI:
+Wagtail is currently compatible with Django 3.2, 4.0 and 4.1. First, install the `wagtail` package from PyPI:
 
 ```sh
 $ pip install wagtail

docs/releases/4.0.md

@@ -9,6 +9,10 @@ depth: 1
 
 ## What's new
 
+### Django 4.1 support
+
+This release adds support for Django 4.1.
+
 ### Global settings models
 
 The new `BaseGenericSetting` base model class allows defining a settings model that applies to all sites rather than just a single site.

docs/releases/upgrading.md

@@ -99,3 +99,4 @@ The compatible versions of Django and Python for each Wagtail release are:
 | 2.15 LTS        | 3.0, 3.1, 3.2              | 3.6, 3.7, 3.8, 3.9, 3.10   |
 | 2.16            | 3.2, 4.0                   | 3.7, 3.8, 3.9, 3.10        |
 | 3.0             | 3.2, 4.0                   | 3.7, 3.8, 3.9, 3.10        |
+| 4.0             | 3.2, 4.0, 4.1              | 3.7, 3.8, 3.9, 3.10        |

setup.py

@@ -19,7 +19,7 @@ except ImportError:
 
 
 install_requires = [
-    "Django>=3.2,<4.1",
+    "Django>=3.2,<4.2",
     "django-modelcluster>=6.0,<7.0",
     "django-permissionedforms>=0.1,<1.0",
     "django-taggit>=2.0,<4.0",
@@ -115,6 +115,7 @@ https://github.com/wagtail/wagtail/.",
         "Framework :: Django",
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
         "Framework :: Wagtail",
         "Topic :: Internet :: WWW/HTTP :: Site Management",
     ],

tox.ini

@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True
 
-envlist = py{37,38,39,310}-dj{32,40,41stable,main}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,noelasticsearch}-{customuser,emailuser}-{tz,notz},
+envlist = py{37,38,39,310}-dj{32,40,41,41stable,main}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,noelasticsearch}-{customuser,emailuser}-{tz,notz},
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -24,6 +24,7 @@ deps =
 
     dj32: Django~=3.2.0
     dj40: Django~=4.0.0
+    dj41: Django~=4.1.0
     dj41stable: git+https://github.com/django/django.git@stable/4.1.x#egg=Django
     djmain: git+https://github.com/django/django.git@main#egg=Django
 

wagtail/project_template/requirements.txt

@@ -1,2 +1,2 @@
-Django>=4.0,<4.1
+Django>=4.1,<4.2
 wagtail==4.0a0