From 5abe2aaa2ec4b86e990adaa2bd4f2a6164d3f560 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Wed, 20 Nov 2024 16:10:20 +0000 Subject: [PATCH 1/4] Drops some version support - Python 3.8 - Django 3.2 --- README.rst | 4 ++-- setup.py | 5 ++--- tox.ini | 8 ++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index 2d800713..5c04108e 100644 --- a/README.rst +++ b/README.rst @@ -32,8 +32,8 @@ wagtailmenus is an extension for Torchbox's `Wagtail CMS = 5.2 -- Django versions 3.2, 4.2 and >= 5.0 -- Python versions 3.8 to 3.12 +- Django versions 4.2 and >= 5.0 +- Python versions 3.9 to 3.12 .. image:: https://raw.githubusercontent.com/jazzband/wagtailmenus/master/docs/source/_static/images/repeating-item.png diff --git a/setup.py b/setup.py index bd8ca531..8ec2b949 100644 --- a/setup.py +++ b/setup.py @@ -62,21 +62,20 @@ "Operating System :: OS Independent", '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', 'Programming Language :: Python :: 3.12', 'Framework :: Django', - 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5.0', 'Framework :: Wagtail :: 5', 'Framework :: Wagtail :: 6', 'Topic :: Internet :: WWW/HTTP', "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ], install_requires=requires, - python_requires='>=3.8', + python_requires='>=3.9', extras_require={ 'testing': testing_extras, 'docs': documentation_extras, diff --git a/tox.ini b/tox.ini index 0ceba291..84340a05 100644 --- a/tox.ini +++ b/tox.ini @@ -3,17 +3,15 @@ skipsdist = True usedevelop = True envlist = - wt52-dj32-py{38,39,310} - wt52-dj42-py{38,39,310,311,312} + wt52-dj42-py{39,310,311,312} wt52-dj50-py{310,311,312} - wt60-dj42-py{38,39,310,311,312} + wt60-dj42-py{39,310,311,312} wt60-dj50-py{310,311,312} wt61-dj{42,50}-py{310,311,312} wt62-dj{42,50}-py{310,311,312} [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 3.11: py311 @@ -27,8 +25,6 @@ commands = coverage run --source=wagtailmenus runtests.py deps = coverage - dj32: Django>=3.2,<4.0 - dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<4.3 dj50: Django>=5.0,<5.1 wt52: wagtail>=5.2,<5.3 From 22dce0f71928e1da5dc35742456d56b4326f46f9 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Wed, 20 Nov 2024 16:12:46 +0000 Subject: [PATCH 2/4] Update python in CI --- .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 c530ea04..b3069c2e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 From 5a73929b83920be516aa3733aeaefc717dd68315 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Wed, 20 Nov 2024 16:25:53 +0000 Subject: [PATCH 3/4] Introduce testing for Django 5.1 and Wagtail 6.3 --- README.rst | 2 +- setup.py | 1 + tox.ini | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 5c04108e..fcaf14ee 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ wagtailmenus is an extension for Torchbox's `Wagtail CMS = 5.2 -- Django versions 4.2 and >= 5.0 +- Django versions 4.2, 5.0 and >= 5.1 - Python versions 3.9 to 3.12 .. image:: https://raw.githubusercontent.com/jazzband/wagtailmenus/master/docs/source/_static/images/repeating-item.png diff --git a/setup.py b/setup.py index 8ec2b949..de2efbee 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,7 @@ 'Framework :: Django', 'Framework :: Django :: 4.2', 'Framework :: Django :: 5.0', + 'Framework :: Django :: 5.1', 'Framework :: Wagtail :: 5', 'Framework :: Wagtail :: 6', 'Topic :: Internet :: WWW/HTTP', diff --git a/tox.ini b/tox.ini index 84340a05..04201b85 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ envlist = wt60-dj50-py{310,311,312} wt61-dj{42,50}-py{310,311,312} wt62-dj{42,50}-py{310,311,312} + wt63-dj{42,50,51}-py{310,311,312} [gh-actions] python = @@ -27,7 +28,9 @@ deps = coverage dj42: Django>=4.2,<4.3 dj50: Django>=5.0,<5.1 + dj51: Django>=5.1,<5.2 wt52: wagtail>=5.2,<5.3 wt60: wagtail>=6.0,<6.1 wt61: wagtail>=6.1,<6.2 wt62: wagtail>=6.2,<6.3 + wt63: wagtail>=6.3,<6.4 From 187963b261c02daf5d144fbf17136cb06214d16d Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Wed, 20 Nov 2024 16:32:05 +0000 Subject: [PATCH 4/4] Update CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41e3db86..bf4e96a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========= +Unreleased +========== + +- Update the testing environment to test Wagtail 6.3 and Django 5.1 + 4.0.1 (04.08.2024) ----------