Skip to content

Commit

Permalink
Merge pull request #3 from torchbox-forks/support/wagtail61
Browse files Browse the repository at this point in the history
Wagtail 6.1
  • Loading branch information
katdom13 authored Jun 14, 2024
2 parents 78beeb1 + 0e25b08 commit 7370f13
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bandit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

Unreleased
----------

* Dropped support for Wagtail < 5.2
* Dropped support for Django < 4.2

4.0.0 (28.02.2024)
----------

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ 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
- 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
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
]

testing_extras = [
'beautifulsoup4>=4.8,<4.10',
'beautifulsoup4>=4.8,<4.13',
'coverage>=4.5',
'django-webtest>=1.9,<1.10',
'html5lib'
]

development_extras = [
Expand Down Expand Up @@ -68,8 +69,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',
Expand Down
10 changes: 3 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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

0 comments on commit 7370f13

Please sign in to comment.