From 35d69b0326614015d3d98062ed10de4a1774ae02 Mon Sep 17 00:00:00 2001 From: Jakub Mastalerz Date: Thu, 29 May 2025 16:06:48 +0100 Subject: [PATCH 01/10] drop wagtail 5.2 from test matrix --- tox.ini | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 739d93a..3d35925 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,8 @@ min_version = 4.11 env_list = - python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.3,6.4} - python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.3,6.4} + python{3.9,3.10,3.11}-django4.2-wagtail{6.3,6.4} + python{3.10,3.11,3.12}-django5.0-wagtail{6.3,6.4} python{3.12,3.13}-django5.1-wagtail{6.3,6.4} [gh-actions] @@ -36,7 +36,6 @@ deps = django5.0: Django>=5.0, <5.1 django5.1: Django>=5.1, <5.2 - wagtail5.2: wagtail>=5.2, <6.0 wagtail6.3: wagtail>=6.3, <6.4 wagtail6.4: wagtail>=6.4, <6.5 From f1ab2902dd2ba003aef0ffed7bc8265302098568 Mon Sep 17 00:00:00 2001 From: Jakub Mastalerz Date: Thu, 29 May 2025 16:09:06 +0100 Subject: [PATCH 02/10] add Wagtail 7 to test matrix --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 3d35925..2b5f106 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,9 @@ min_version = 4.11 env_list = - python{3.9,3.10,3.11}-django4.2-wagtail{6.3,6.4} + python{3.9,3.10,3.11}-django4.2-wagtail{6.3,6.4,7.0} python{3.10,3.11,3.12}-django5.0-wagtail{6.3,6.4} - python{3.12,3.13}-django5.1-wagtail{6.3,6.4} + python{3.12,3.13}-django5.1-wagtail{6.3,6.4,7.0} [gh-actions] python = @@ -35,7 +35,7 @@ deps = django4.2: Django>=4.2, <5.0 django5.0: Django>=5.0, <5.1 django5.1: Django>=5.1, <5.2 - + wagtail7.0: wagtail>=7.0, <7.1 wagtail6.3: wagtail>=6.3, <6.4 wagtail6.4: wagtail>=6.4, <6.5 From fd209d50f4f9321ddbd0b0534aab8ceaf64665e5 Mon Sep 17 00:00:00 2001 From: Jakub Mastalerz Date: Thu, 29 May 2025 16:12:56 +0100 Subject: [PATCH 03/10] drop deprecated Django versions --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 2b5f106..e7c6f16 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,8 @@ min_version = 4.11 env_list = python{3.9,3.10,3.11}-django4.2-wagtail{6.3,6.4,7.0} - python{3.10,3.11,3.12}-django5.0-wagtail{6.3,6.4} python{3.12,3.13}-django5.1-wagtail{6.3,6.4,7.0} + python{3.10,3.11,3.12,3.13}-django5.2-wagtail{6.3,6.4,7.0} [gh-actions] python = @@ -33,11 +33,11 @@ extras = testing deps = django4.2: Django>=4.2, <5.0 - django5.0: Django>=5.0, <5.1 django5.1: Django>=5.1, <5.2 - wagtail7.0: wagtail>=7.0, <7.1 + django5.2: Django>=5.2, <5.3 wagtail6.3: wagtail>=6.3, <6.4 wagtail6.4: wagtail>=6.4, <6.5 + wagtail7.0: wagtail>=7.0, <7.1 install_command = python -Im pip install -U {opts} {packages} commands = From e7ae1dcbe69ec6958ce3b026db282ae8b96a8a05 Mon Sep 17 00:00:00 2001 From: Jakub Mastalerz Date: Thu, 29 May 2025 16:15:57 +0100 Subject: [PATCH 04/10] update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2aea58b..8ed705a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Add tox testing for Django 5.1 and Wagtail 6.3 -- Drop testing for Python 3.8 +- Add tox testing for Wagtail 6.3, 6.4 and 7.0, Django 5.1, 5.2 +- Drop testing for Wagtail 5.2, Django 5.0, Python 3.8 ## [0.8] - 2024-02-23 From 4e2350ec53cf6ca3471ee7018aaafa56160199ee Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 4 Sep 2025 13:57:05 +0100 Subject: [PATCH 05/10] Update the tox testing matrix --- CHANGELOG.md | 8 ++++++++ pyproject.toml | 6 +++--- tox.ini | 11 +++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2aea58b..1be1994 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +Wagtail 7.0 and 7.1 upgrade changes: + +- Add tox testing for Django 5.2 and Wagtail 7.0, 7.1 +- Drop testing for Django 5.0 +- Drop testing for Wagtail 5.2 and 6.4 + +Wagtail 6.3 upgrade changes: + - Add tox testing for Django 5.1 and Wagtail 6.3 - Drop testing for Python 3.8 diff --git a/pyproject.toml b/pyproject.toml index 4b8b088..44d6a09 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,18 +20,18 @@ classifiers = [ "Programming Language :: Python :: 3.13", "Framework :: Django", "Framework :: Django :: 4.2", - "Framework :: Django :: 5.0", "Framework :: Django :: 5.1", + "Framework :: Django :: 5.2", "Framework :: Wagtail", - "Framework :: Wagtail :: 5", "Framework :: Wagtail :: 6", + "Framework :: Wagtail :: 7", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ] dynamic = ["version"] requires-python = ">=3.9" -dependencies = ["Wagtail>=5.2"] +dependencies = ["Wagtail>=6.3"] [project.optional-dependencies] testing = [ diff --git a/tox.ini b/tox.ini index 739d93a..8e226ac 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,8 @@ min_version = 4.11 env_list = - python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.3,6.4} - python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.3,6.4} - python{3.12,3.13}-django5.1-wagtail{6.3,6.4} + python{3.9}-django4.2-wagtail{6.3,7.0,7.1} + python{3.10,3.11,3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.1} [gh-actions] python = @@ -33,12 +32,12 @@ extras = testing deps = django4.2: Django>=4.2, <5.0 - django5.0: Django>=5.0, <5.1 django5.1: Django>=5.1, <5.2 + django5.2: Django>=5.2, <5.3 - wagtail5.2: wagtail>=5.2, <6.0 wagtail6.3: wagtail>=6.3, <6.4 - wagtail6.4: wagtail>=6.4, <6.5 + wagtail7.0: wagtail>=7.0, <7.1 + wagtail7.1: wagtail>=7.1, <7.2 install_command = python -Im pip install -U {opts} {packages} commands = From 8b1ab6738eda030d4ce42495a17f52c9f052644c Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 4 Sep 2025 14:08:53 +0100 Subject: [PATCH 06/10] Fixes "ModuleNotFoundError: No module named 'tests'" in runtests.py when running tests. --- runtests.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/runtests.py b/runtests.py index 6ae4423..f377851 100644 --- a/runtests.py +++ b/runtests.py @@ -1,4 +1,5 @@ #!/usr/bin/env python + import argparse import os import sys @@ -7,6 +8,8 @@ from django.core.management import execute_from_command_line +# Ensure the tests directory is in sys.path for Django import +sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings" From 86fe46a99f4cb2c70b5a87f7b00c03fb33902420 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Mon, 17 Nov 2025 16:41:15 +0000 Subject: [PATCH 07/10] Revise the versions tested in tox and GitHub Actions --- .github/workflows/test.yml | 2 +- pyproject.toml | 1 + tox.ini | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa056dd..2c17e22 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 44d6a09..bf185c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,6 +18,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Framework :: Django", "Framework :: Django :: 4.2", "Framework :: Django :: 5.1", diff --git a/tox.ini b/tox.ini index 8e226ac..8c70197 100644 --- a/tox.ini +++ b/tox.ini @@ -2,16 +2,17 @@ min_version = 4.11 env_list = - python{3.9}-django4.2-wagtail{6.3,7.0,7.1} - python{3.10,3.11,3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.1} + python{3.10,3.11,3.12}-django4.2-wagtail{6.3,7.0,7.2} + python{3.10,3.11,3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.2} + python3.14-django5.2-wagtail{7.0,7.2} [gh-actions] python = - 3.9: python3.9 3.10: python3.10 3.11: python3.11 3.12: python3.12 3.13: python3.13 + 3.14: python3.14 [testenv] package = wheel @@ -37,7 +38,7 @@ deps = wagtail6.3: wagtail>=6.3, <6.4 wagtail7.0: wagtail>=7.0, <7.1 - wagtail7.1: wagtail>=7.1, <7.2 + wagtail7.2: wagtail>=7.2, <7.3 install_command = python -Im pip install -U {opts} {packages} commands = From 759b102f2ae28ee91d7e29462d2e59a29c50009d Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Mon, 24 Nov 2025 09:32:11 +0000 Subject: [PATCH 08/10] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Dan Braghiș <31622+zerolab@users.noreply.github.com> --- CHANGELOG.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1be1994..4bec444 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,16 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -Wagtail 7.0 and 7.1 upgrade changes: - -- Add tox testing for Django 5.2 and Wagtail 7.0, 7.1 -- Drop testing for Django 5.0 -- Drop testing for Wagtail 5.2 and 6.4 - -Wagtail 6.3 upgrade changes: - -- Add tox testing for Django 5.1 and Wagtail 6.3 -- Drop testing for Python 3.8 +- Add Django 5.1 and 5.2, Wagtail 7.0 and 7.2 to the test matrix +- Drop support for Python < 3.10 +- Drop support for Wagtail < 6.3 ## [0.8] - 2024-02-23 From 5cc78ce2131841ed4f3176b039ad3f62183d6070 Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Mon, 24 Nov 2025 09:32:20 +0000 Subject: [PATCH 09/10] Update pyproject.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Dan Braghiș <31622+zerolab@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bf185c4..35b2da3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ classifiers = [ ] dynamic = ["version"] -requires-python = ">=3.9" +requires-python = ">=3.10" dependencies = ["Wagtail>=6.3"] [project.optional-dependencies] From d4739c5a4784a2e981f3081338f02e3d7e67e7f9 Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Mon, 24 Nov 2025 09:32:38 +0000 Subject: [PATCH 10/10] Update tox.ini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Dan Braghiș <31622+zerolab@users.noreply.github.com> --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 8c70197..ae0dd69 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,9 @@ min_version = 4.11 env_list = - python{3.10,3.11,3.12}-django4.2-wagtail{6.3,7.0,7.2} - python{3.10,3.11,3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.2} - python3.14-django5.2-wagtail{7.0,7.2} + python{3.10,3.11}-django4.2-wagtail{6.3,7.0} + python{3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.2} + python3.14-django5.2-wagtail{7.2} [gh-actions] python =