Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wagtail 6.3 updates #503

Merged
merged 12 commits into from
Jan 2, 2025
Merged

Wagtail 6.3 updates #503

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5abe2aa
Drops some version support
nickmoreton Nov 20, 2024
22dce0f
Update python in CI
nickmoreton Nov 20, 2024
5a73929
Introduce testing for Django 5.1 and Wagtail 6.3
nickmoreton Nov 20, 2024
187963b
Update CHANGELOG
nickmoreton Nov 20, 2024
346cedc
Alter success message assertion
nickmoreton Dec 24, 2024
4485a75
Make the regex less specific
nickmoreton Dec 24, 2024
67904e6
Update templates to better reflect the snippet views
nickmoreton Dec 24, 2024
ab128aa
Disable copy view for main menu admin
nickmoreton Dec 24, 2024
ffb3fb3
Templates need to be conditional based on the Wagtail version
nickmoreton Dec 24, 2024
067f04b
Update CHANGELOG
nickmoreton Dec 24, 2024
9d8bf79
Test against Python 3.13
nickmoreton Jan 2, 2025
9edae1f
Wagtail 6.3 templates should be the default
nickmoreton Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose python 3.13 could be added now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK thanks I can update this after the holidays.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Python 3.13 added here: 9d8bf79


steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
----------

Expand Down
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 5 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion wagtailmenus/tests/test_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
form = edit_view.forms[next(reversed(OrderedDict(edit_view.forms)))]
response = form.submit().follow()

assert re.search(r"Main menu [^<>]+ updated", response.content.decode())
assert "Main menu 'Main menu for wagtailmenus (co.uk)' updated." in response
Fixed Show fixed Hide fixed


class LinkPageCMSTest(TestCase):
Expand Down
Loading