From 6567e8131f4bb07ce79c85986150c0f048531f5b Mon Sep 17 00:00:00 2001 From: katdom13 Date: Tue, 28 May 2024 19:18:21 +0800 Subject: [PATCH 1/4] Update change logs, classifiers, test matrix on tox.ini --- CHANGELOG.md | 6 ++++++ README.rst | 2 +- setup.py | 2 +- tox.ini | 10 +++------- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e34f2608..49bf39f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +Unreleased +---------- + +* Dropped support for Wagtail < 5.2 +* Dropped support for Django < 4.2 + 4.0.0 (28.02.2024) ---------- diff --git a/README.rst b/README.rst index 2d800713..fdf00943 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ wagtailmenus is an extension for Torchbox's `Wagtail CMS = 5.2 -- Django versions 3.2, 4.2 and >= 5.0 +- Django versions >= 4.2 - Python versions 3.8 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..1acbd796 100644 --- a/setup.py +++ b/setup.py @@ -68,8 +68,8 @@ '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', diff --git a/tox.ini b/tox.ini index dca3502d..443c2c1a 100644 --- a/tox.ini +++ b/tox.ini @@ -3,11 +3,8 @@ skipsdist = True usedevelop = True envlist = - wt52-dj32-py{38,39,310} - wt52-dj42-py{38,39,310,311,312} - wt52-dj50-py{310,311,312} - wt60-dj42-py{38,39,310,311,312} - wt60-dj50-py{310,311,312} + wt{52,60,61}-dj42-py{38,39,310,311} + wt{52,60,61}-dj50-py{310,311,312} [gh-actions] python = @@ -25,9 +22,8 @@ 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 wt60: wagtail>=6.0,<6.1 + wt61: wagtail>=6.1,<6.2 From a8dc3a457f8c26e21d73aa4c2c2b3778f22dca0e Mon Sep 17 00:00:00 2001 From: katdom13 Date: Tue, 28 May 2024 19:26:32 +0800 Subject: [PATCH 2/4] Add html5lib to test extras --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 1acbd796..c828b912 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ 'beautifulsoup4>=4.8,<4.10', 'coverage>=4.5', 'django-webtest>=1.9,<1.10', + 'html5lib' ] development_extras = [ From a2ee51fd8c858692ca5b83f79911e357de5add46 Mon Sep 17 00:00:00 2001 From: katdom13 Date: Tue, 28 May 2024 20:20:33 +0800 Subject: [PATCH 3/4] Update testing extras --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c828b912..3d03a9dd 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ ] testing_extras = [ - 'beautifulsoup4>=4.8,<4.10', + 'beautifulsoup4>=4.8,<4.13', 'coverage>=4.5', 'django-webtest>=1.9,<1.10', 'html5lib' From 0e25b08fc80d0d57dc4ab0cb8932232f97812862 Mon Sep 17 00:00:00 2001 From: katdom13 Date: Tue, 28 May 2024 20:21:29 +0800 Subject: [PATCH 4/4] Bump workflow versions --- .github/workflows/bandit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bandit.yml b/.github/workflows/bandit.yml index 1cfa329c..48eb061a 100644 --- a/.github/workflows/bandit.yml +++ b/.github/workflows/bandit.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Bandit Scan uses: shundor/python-bandit-scan@9cc5aa4a006482b8a7f91134412df6772dbda22c with: # optional arguments