From e05c210e46791b880c7b7d58d4e3a6aa39a36c90 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Mon, 18 Nov 2024 16:35:34 +0000 Subject: [PATCH 1/9] Add tox testing for Wagtail 6.2 and 6.3 Drop tasting for Python 3.8 --- .github/workflows/test.yml | 2 +- tox.ini | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d3732e..7155e50 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/tox.ini b/tox.ini index c0faaaa..178dc7e 100644 --- a/tox.ini +++ b/tox.ini @@ -2,12 +2,11 @@ min_version = 4.11 env_list = - python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0,6.1} - python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0,6.1} + python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0,6.1,6.2,6.3} + python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0,6.1,6.2,6.3} [gh-actions] python = - 3.8: python3.8 3.9: python3.9 3.10: python3.10 3.11: python3.11 @@ -36,6 +35,8 @@ deps = wagtail5.2: wagtail>=5.2, <6.0 wagtail6.0: wagtail>=6.0, <6.1 + wagtail6.1: wagtail>=6.1, <6.2 + wagtail6.2: wagtail>=6.2, <6.3 install_command = python -Im pip install -U {opts} {packages} commands = From 28eea2a836aa9c5a164fb3427a501a56c98c0fed Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Mon, 18 Nov 2024 16:38:53 +0000 Subject: [PATCH 2/9] Introduce tox testing for Django 5.1 --- pyproject.toml | 4 ++-- tox.ini | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 056873d..4eb38d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,6 @@ classifiers = [ "License :: OSI Approved :: BSD License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -21,6 +20,7 @@ classifiers = [ "Framework :: Django", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", + "Framework :: Django :: 5.1", "Framework :: Wagtail", "Framework :: Wagtail :: 5", "Framework :: Wagtail :: 6", @@ -29,7 +29,7 @@ classifiers = [ ] dynamic = ["version"] -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = ["Wagtail>=5.2"] [project.optional-dependencies] diff --git a/tox.ini b/tox.ini index 178dc7e..481816e 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ min_version = 4.11 env_list = python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0,6.1,6.2,6.3} python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0,6.1,6.2,6.3} + python{3.10,3.11,3.12}-django5.1-wagtail6.3 [gh-actions] python = @@ -32,6 +33,7 @@ extras = testing deps = django4.2: Django>=4.2, <5.0 django5.0: Django>=5.0, <5.1 + django5.1: Django>=5.1, <5.2 wagtail5.2: wagtail>=5.2, <6.0 wagtail6.0: wagtail>=6.0, <6.1 From 2eb02840202c4d1204f568373a44071c95ca5307 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Mon, 18 Nov 2024 16:48:58 +0000 Subject: [PATCH 3/9] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eae5598..ea2b387 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ 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.2 + 6.3 +- Drop testing for python 3.8 + ## [0.8] - 2024-02-23 ### Changed From e54e01b0bb8cd66f80be67360bfff13e15cdc14a Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Thu, 21 Nov 2024 12:43:52 +0000 Subject: [PATCH 4/9] Drop wagtail 6.0 and 6.1 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 481816e..6f913e1 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.0,6.1,6.2,6.3} - python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0,6.1,6.2,6.3} + python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.2,6.3} + python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.2,6.3} python{3.10,3.11,3.12}-django5.1-wagtail6.3 [gh-actions] From ae883a0f6609252743fe6df20da0b4b0d886d8b2 Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Thu, 21 Nov 2024 12:44:35 +0000 Subject: [PATCH 5/9] Drop wagtail 6.0 and 6.1 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 6f913e1..0f54c0a 100644 --- a/tox.ini +++ b/tox.ini @@ -36,9 +36,8 @@ deps = django5.1: Django>=5.1, <5.2 wagtail5.2: wagtail>=5.2, <6.0 - wagtail6.0: wagtail>=6.0, <6.1 - wagtail6.1: wagtail>=6.1, <6.2 wagtail6.2: wagtail>=6.2, <6.3 + wagtail6.3: wagtail>=6.3, <6.4 install_command = python -Im pip install -U {opts} {packages} commands = From be03da09bb8657494ae62ea91b6f41c3e9d0199e Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 21 Nov 2024 12:47:37 +0000 Subject: [PATCH 6/9] This adds python 3.13 to the test matrix - Also updates the python version in the publish.yml workflow to 3.13 --- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 2 +- pyproject.toml | 1 + tox.ini | 9 +++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6d972dd..a6d8f46 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.13' cache: "pip" cache-dependency-path: "**/pyproject.toml" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7155e50..e3f09bb 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"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 4eb38d1..4b8b088 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Framework :: Django", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", diff --git a/tox.ini b/tox.ini index 0f54c0a..c241a05 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ min_version = 4.11 env_list = python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.2,6.3} python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.2,6.3} - python{3.10,3.11,3.12}-django5.1-wagtail6.3 + python{3.10,3.11,3.12,3.13}-django5.1-wagtail6.3 [gh-actions] python = @@ -12,6 +12,7 @@ python = 3.10: python3.10 3.11: python3.11 3.12: python3.12 + 3.13: python3.13 [testenv] package = wheel @@ -44,7 +45,7 @@ commands = python -Im coverage run runtests.py test --deprecation all {posargs: -v 2} [testenv:coverage-report] -base_python = python3.12 +base_python = python3.13 package = skip deps = coverage>=7.0,<8.0 @@ -54,14 +55,14 @@ commands = [testenv:wagtailmain] description = Test with latest Wagtail main branch -base_python = python3.12 +base_python = python3.13 deps = wagtailmain: git+https://github.com/wagtail/wagtail.git@main#egg=Wagtail [testenv:interactive] package = editable description = An interactive environment for local testing purposes -base_python = python3.12 +base_python = python3.13 commands_pre = python {toxinidir}/manage.py makemigrations From 63da2ec2c9008e7eaa42dce0ab67ede0047b0cbf Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Thu, 21 Nov 2024 16:08:49 +0000 Subject: [PATCH 7/9] use titlecase 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea2b387..bbcc51a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ 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.2 + 6.3 -- Drop testing for python 3.8 +- Drop testing for Python 3.8 ## [0.8] - 2024-02-23 From 4f94c039f53f9a46c51141e94fd9b915b65d1a49 Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Thu, 21 Nov 2024 16:09:47 +0000 Subject: [PATCH 8/9] help the planet 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index c241a05..a59407f 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ min_version = 4.11 env_list = python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.2,6.3} python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.2,6.3} - python{3.10,3.11,3.12,3.13}-django5.1-wagtail6.3 + python{3.12,3.13}-django5.1-wagtail6.3 [gh-actions] python = From a117eaa673ff241c7f996d8ae134c48400bed36c Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 21 Nov 2024 16:25:03 +0000 Subject: [PATCH 9/9] Fix the coverage error - update PYTHON_LATEST to 3.13 --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e3f09bb..aa056dd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ env: TOX_TESTENV_PASSENV: FORCE_COLOR PIP_DISABLE_PIP_VERSION_CHECK: "1" PIP_NO_PYTHON_VERSION_WARNING: "1" - PYTHON_LATEST: "3.12" + PYTHON_LATEST: "3.13" jobs: tests: @@ -67,6 +67,7 @@ jobs: name: coverage-data-${{ matrix.python-version }} path: .coverage.* if-no-files-found: ignore + include-hidden-files: true retention-days: 1 coverage: