Merge branch 'support/wagtail-63' into fix/save-button

torchbox-forks · Dec 23, 2024 · 56cb11c · 56cb11c
2 parents 9b8d14c + 187963b
commit 56cb11c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git 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

diff --git 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)
 ----------
 

diff --git a/README.rst b/README.rst
@@ -32,8 +32,8 @@ wagtailmenus is an extension for Torchbox's `Wagtail CMS <https://github.com/tor
 The current version is tested for compatibility with the following:
 
 - Wagtail versions >= 5.2
-- Django versions 3.2, 4.2 and >= 5.0
-- Python versions 3.8 to 3.12
+- 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
@@ -62,21 +62,21 @@
         "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 :: Django :: 5.1',
         '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
@@ -3,17 +3,16 @@ 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}
+    wt63-dj{42,50,51}-py{310,311,312}
 
 [gh-actions]
 python =
-    3.8: py38
     3.9: py39
     3.10: py310
     3.11: py311
@@ -27,11 +26,11 @@ 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
+    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