From ed4347b9f83186352110340e2f7744397fe2c8ca Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Mon, 19 May 2025 17:42:02 +0100 Subject: [PATCH 01/10] Update the tox configuration to use Wagtail 7.0 and Django 5.2 --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 455b44b..72de08a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = # Django versions with their respectively supported Python versions and the most recent Wagtail LTS - py{39,310,311,312}-django42-wagtail{63,70} - py{310,311,312,313}-django{51,52}-wagtail{63,70} + py{39,310,311,312}-django42-wagtail70 + py{310,311,312,313}-django{51,52}-wagtail70 # Old Wagtail versions with the oldest Django LTS and Python py39-django42-wagtail52 isolated_build = True From b3f5a83098015ec2eac35c6298eb31f12facc462 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 22 May 2025 11:36:44 +0100 Subject: [PATCH 02/10] Add wagtail 6.3 back into tox testing --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 72de08a..455b44b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = # Django versions with their respectively supported Python versions and the most recent Wagtail LTS - py{39,310,311,312}-django42-wagtail70 - py{310,311,312,313}-django{51,52}-wagtail70 + py{39,310,311,312}-django42-wagtail{63,70} + py{310,311,312,313}-django{51,52}-wagtail{63,70} # Old Wagtail versions with the oldest Django LTS and Python py39-django42-wagtail52 isolated_build = True From 41b3859522130d1fd05ffd2744a1bcf92a2be542 Mon Sep 17 00:00:00 2001 From: Rachel Smith Date: Thu, 4 Sep 2025 13:04:48 +0100 Subject: [PATCH 03/10] update tox configuration for wagtail 7.1 --- CHANGELOG.md | 2 +- tox.ini | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0a25bc..9917796 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -- Add testing for Wagtail 6.3 & 7.0 +- Add testing for Wagtail 6.3, 7.0 and 7.1 - Use python 3.13 across workflows and formatting ## v2.0.1 (2024-10-22) diff --git a/tox.ini b/tox.ini index 455b44b..39da791 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = # Django versions with their respectively supported Python versions and the most recent Wagtail LTS - py{39,310,311,312}-django42-wagtail{63,70} - py{310,311,312,313}-django{51,52}-wagtail{63,70} + py{39,310,311,312}-django42-wagtail{63,70,71} + py{310,311,312,313}-django{51,52}-wagtail{63,70,71} # Old Wagtail versions with the oldest Django LTS and Python py39-django42-wagtail52 isolated_build = True @@ -22,6 +22,7 @@ deps = django52: Django>=5.2,<5.3 wagtail52: wagtail>=5.2,<5.3 wagtail70: wagtail>=7.0,<7.1 + wagtail71: wagtail>=7.1,<7.2 pytest pytest-django extras = dev From 739e4503c509dc49b573b380ee227d0131ddc2c0 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Fri, 31 Oct 2025 11:11:07 +0000 Subject: [PATCH 04/10] Update to test and support Wagtail 7.2 --- CHANGELOG.md | 1 + pyproject.toml | 6 +++--- tox.ini | 13 +++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9917796..cf746a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +- Add testing/support for Wagtail 7.2 - Add testing for Wagtail 6.3, 7.0 and 7.1 - Use python 3.13 across workflows and formatting diff --git a/pyproject.toml b/pyproject.toml index 7f002eb..a83f10d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,18 +11,18 @@ license = {file = "LICENSE"} classifiers = [ "License :: OSI Approved :: BSD License", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", ] keywords = ["django", "anonymization", "data cleaning"] dependencies = [ "Faker>=8", "Django>=4.2", ] -requires-python = ">=3.9" +requires-python = ">=3.10" [project.urls] Home = "https://github.com/torchbox/django-birdbath" @@ -34,7 +34,7 @@ dev = [ "pytest~=8.3", "pytest-django~=4.9", "ruff==0.6.9", - "wagtail>=5.2", + "wagtail>=7.0", ] [tool.flit.module] diff --git a/tox.ini b/tox.ini index 39da791..aa03182 100644 --- a/tox.ini +++ b/tox.ini @@ -1,28 +1,25 @@ [tox] envlist = - # Django versions with their respectively supported Python versions and the most recent Wagtail LTS - py{39,310,311,312}-django42-wagtail{63,70,71} - py{310,311,312,313}-django{51,52}-wagtail{63,70,71} - # Old Wagtail versions with the oldest Django LTS and Python - py39-django42-wagtail52 + py{310,311,312}-django42-wagtail{70,72} + py{310,311,312,313}-django{51,52}-wagtail{70,72} + isolated_build = True [gh-actions] python = - 3.9: py39 3.10: py310 3.11: py311 3.12: py312 3.13: py313 + 3.14: py314 [testenv] deps = django42: Django>=4.2,<5.0 django51: Django>=5.1,<5.2 django52: Django>=5.2,<5.3 - wagtail52: wagtail>=5.2,<5.3 wagtail70: wagtail>=7.0,<7.1 - wagtail71: wagtail>=7.1,<7.2 + wagtail72: wagtail>=7.2,<7.3 pytest pytest-django extras = dev From ca3bfe73c3a39b2fb4f66f4c6eded5724693dbdb Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Fri, 31 Oct 2025 11:13:51 +0000 Subject: [PATCH 05/10] We don't need black, flake8, and isort anymore since we are using ruff --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tox.ini b/tox.ini index aa03182..236a066 100644 --- a/tox.ini +++ b/tox.ini @@ -27,10 +27,6 @@ commands = pytest {posargs} [testenv:lint] -deps = - black==23.1.0 - flake8==6.0.0 - isort==5.12.0 commands = ruff check . ruff format . --check From 8feb3de96eb2cd269468e7ed4de00fbcdb6debab Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Fri, 31 Oct 2025 11:16:26 +0000 Subject: [PATCH 06/10] Update CI to drop Python 3.9 and add Python 3.14 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0b9f14d..31527ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: needs: lint strategy: matrix: - python: ['3.9', '3.10', '3.11', '3.12', '3.13'] + python: ['3.10', '3.11', '3.12', '3.13', '3.14'] steps: - uses: actions/checkout@v4 From 71a45472255ab4dfab7aa8772f1fc092b447ee2e Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Fri, 31 Oct 2025 11:21:21 +0000 Subject: [PATCH 07/10] Bump some dev dependencies --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a83f10d..54ed8e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,10 +30,10 @@ Home = "https://github.com/torchbox/django-birdbath" [project.optional-dependencies] dev = [ "django>=4.2", - "pre-commit>=3.8.0", - "pytest~=8.3", - "pytest-django~=4.9", - "ruff==0.6.9", + "pre-commit>=4.3.0", + "pytest~=8.4", + "pytest-django~=4.11", + "ruff==0.4.10", "wagtail>=7.0", ] From ca1b92d70c8fa978c61a7b6a9ed1a329ec26cd02 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Wed, 5 Nov 2025 14:47:25 +0000 Subject: [PATCH 08/10] Add testing for Python 3.14 in tox.ini --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 236a066..d24ccef 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = py{310,311,312}-django42-wagtail{70,72} py{310,311,312,313}-django{51,52}-wagtail{70,72} + py314-django52-wagtail{70,72} isolated_build = True From d9a19beb413062866679d21b2a83ba89317a9154 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Wed, 5 Nov 2025 14:49:53 +0000 Subject: [PATCH 09/10] Update CHANGELOG --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf746a1..39764bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,7 @@ ## Unreleased - Add testing/support for Wagtail 7.2 -- Add testing for Wagtail 6.3, 7.0 and 7.1 -- Use python 3.13 across workflows and formatting +- Pin the minimum supported Wagtail version to 7.0 ## v2.0.1 (2024-10-22) From eab7e3a4a768d75ffbbb1c4dbe22817afc75973d Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Wed, 5 Nov 2025 15:00:30 +0000 Subject: [PATCH 10/10] Correct the django42 dependency --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d24ccef..45319ce 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ python = [testenv] deps = - django42: Django>=4.2,<5.0 + django42: Django>=4.2,<4.3 django51: Django>=5.1,<5.2 django52: Django>=5.2,<5.3 wagtail70: wagtail>=7.0,<7.1