From e9d9e91f0eea52f3171cc8dcc321ca08efb650b0 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Wed, 8 Nov 2023 15:48:03 +0800 Subject: [PATCH 1/2] Add support for Wagtail 5.2 and Python 3.12, drop support for Django 4.0 --- .github/workflows/test.yml | 2 +- CHANGELOG.md | 6 ++++++ setup.py | 2 +- tox.ini | 8 ++++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e19c0d4c..fc5281a4 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"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index f79ec474..a0d1ba4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +Unreleased +---------- + +* Added support for Wagtail 5.2 and Python 3.12. +* Dropped support for Django 4.0. + 3.1.9 (23.09.2023) ---------- diff --git a/setup.py b/setup.py index ebb3176b..a1ff4988 100644 --- a/setup.py +++ b/setup.py @@ -66,9 +66,9 @@ '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.0', 'Framework :: Django :: 4.1', 'Framework :: Django :: 4.2', 'Framework :: Wagtail :: 2', diff --git a/tox.ini b/tox.ini index 97b65a3d..2b482fa7 100644 --- a/tox.ini +++ b/tox.ini @@ -3,10 +3,9 @@ skipsdist = True usedevelop = True envlist = - py{38,39,310}-dj{40}-wt{41,42} py{38,39,310}-dj{32,41}-wt{41,42,50} - py{311}-dj{41}-wt{41,42,50} - py{38,39,310,311}-dj{41,42}-wt{51}-wma{10} + py{311,312}-dj41-wt{41,42,50} + py{38,39,310,311,312}-dj{41,42}-wt{51,52}-wma{10} [gh-actions] python = @@ -14,6 +13,7 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [testenv] @@ -25,10 +25,10 @@ deps = coverage wma10: wagtail_modeladmin>=1.0,<1.1 dj32: Django>=3.2,<4.0 - dj40: Django>=4.0,<4.1 dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<4.3 wt41: wagtail>=4.1,<4.2 wt42: wagtail>=4.2,<5.0 wt50: wagtail>=5.0,<5.1 wt51: wagtail>=5.1,<5.2 + wt52: wagtail>=5.2,<5.3 From 002fe7723c5a98689fd0ba9c4f08f324939077f6 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 9 Nov 2023 17:13:37 +0800 Subject: [PATCH 2/2] Update docs/source/index.rst and README.rst --- README.rst | 3 ++- docs/source/index.rst | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 897ec1fd..093e6ead 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,8 @@ wagtailmenus is an extension for Torchbox's `Wagtail CMS = 4.1 -- Python versions 3.8 to 3.11 +- Django versions 3.2, 4.1, and 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/docs/source/index.rst b/docs/source/index.rst index df472926..48954359 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -8,8 +8,8 @@ wagtailmenus is an open-source extension for `Wagtail CMS The current version is tested for compatibility with the following: - Wagtail versions >= 4.1 -- Django versions 3.2, 4.0, 4.1, and 4.2 -- Python versions 3.8 to 3.11 +- Django versions 3.2, 4.1, and 4.2 +- Python versions 3.8 to 3.12 To find out more about what wagtailmenus does and why, see :doc:`overview`