From cc5ceb7ce319b7546401d562ac4789db94d99e53 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Mon, 19 May 2025 17:42:02 +0100 Subject: [PATCH 1/5] Update the tox configuration to use Wagtail 7.0 and Django 5.2 --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 5b9be82..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,313}-django42-wagtail62 - py{310,311,312,313}-django{50,51}-wagtail62 + 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 @@ -18,10 +18,10 @@ python = [testenv] deps = django42: Django>=4.2,<5.0 - django50: Django>=5.0,<5.1 django51: Django>=5.1,<5.2 + django52: Django>=5.2,<5.3 wagtail52: wagtail>=5.2,<5.3 - wagtail62: wagtail>=6.2,<6.3 + wagtail70: wagtail>=7.0,<7.1 pytest pytest-django extras = dev From 7e2bde81a2703a37676ca0371b96f4f74cb13538 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 22 May 2025 11:36:44 +0100 Subject: [PATCH 2/5] 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 2a89e72860a7675a9518eaf079a779d012f57aa0 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 22 May 2025 11:37:23 +0100 Subject: [PATCH 3/5] Change the Python version in the GitHub Actions workflow to 3.13 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c68fcd8..0b9f14d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,10 +22,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - uses: pre-commit/action@v3.0.1 test: From a581f57a70bf54c0fa1ad5af57a61ed38ca70be2 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 22 May 2025 11:53:59 +0100 Subject: [PATCH 4/5] Modify the django and wagtail dependencies to be >=4.2 and >=5.2 respectively Also update the target version for ruff to py313 --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 69b3c3c..7f002eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,12 +29,12 @@ Home = "https://github.com/torchbox/django-birdbath" [project.optional-dependencies] dev = [ - "django~=4.2", + "django>=4.2", "pre-commit>=3.8.0", "pytest~=8.3", "pytest-django~=4.9", "ruff==0.6.9", - "wagtail~=5.2", + "wagtail>=5.2", ] [tool.flit.module] @@ -44,7 +44,7 @@ name = "birdbath" include = ["LICENSE", "CHANGELOG.md", "README.md"] [tool.ruff] -target-version = "py39" +target-version = "py313" exclude = [ ".github", From 19452c24d435abf25eef36873a40f62e27493119 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 22 May 2025 11:59:09 +0100 Subject: [PATCH 5/5] Update chnagelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d1b8c..d0a25bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## Unreleased + +- Add testing for Wagtail 6.3 & 7.0 +- Use python 3.13 across workflows and formatting + ## v2.0.1 (2024-10-22) - Add tests