From d4837edef941f0a0eef77af97cc667bec8596f84 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 3 Aug 2022 13:32:11 +0200 Subject: [PATCH] Formalise support for Django 4.1 --- .github/workflows/test.yml | 12 ++++++------ CHANGELOG.txt | 1 + README.md | 2 +- docs/getting_started/integrating_into_django.md | 2 +- docs/releases/4.0.md | 4 ++++ docs/releases/upgrading.md | 1 + setup.py | 3 ++- tox.ini | 3 ++- wagtail/project_template/requirements.txt | 2 +- 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bcb81c5fb0..71724eb8d5 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4d9a436510..169e968fdf 100644 --- a/CHANGELOG.txt +++ b/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) diff --git a/README.md b/README.md index a9e3be7a95..7be8dd03eb 100644 --- a/README.md +++ b/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 diff --git a/docs/getting_started/integrating_into_django.md b/docs/getting_started/integrating_into_django.md index 0b2adbff20..c5ff7b95f2 100644 --- a/docs/getting_started/integrating_into_django.md +++ b/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 diff --git a/docs/releases/4.0.md b/docs/releases/4.0.md index 3597b1e652..f3dfb3c9a5 100644 --- a/docs/releases/4.0.md +++ b/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. diff --git a/docs/releases/upgrading.md b/docs/releases/upgrading.md index 9fe27bf136..cfee6ebb47 100644 --- a/docs/releases/upgrading.md +++ b/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 | diff --git a/setup.py b/setup.py index eaae621f37..82d49c4845 100755 --- a/setup.py +++ b/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", ], diff --git a/tox.ini b/tox.ini index 4c3f925e2f..ce851dae74 100644 --- a/tox.ini +++ b/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 diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index 0e98b6e36b..50cfa9685c 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,2 +1,2 @@ -Django>=4.0,<4.1 +Django>=4.1,<4.2 wagtail==4.0a0