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

Support/wagtail 63 #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support/wagtail 63 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3699085
Update to incoude testing for Wagtail 6.3
nickmoreton Nov 27, 2024
524c17a
Update the sanbox requirements
nickmoreton Nov 27, 2024
08533fe
Update the CHANGES file
nickmoreton Nov 27, 2024
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/python-tox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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', '3.13']
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python }}
Expand Down
7 changes: 6 additions & 1 deletion CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ Unreleased
- Add support for Wagtail 5.2 and 6.x
- Drop support for Wagtail < 5.2
- Update `otp_form` to be compatible with Wagtail 5.2 and 6.x
- Add support for Django 5.0
- Add support for Django 5.0 (currently 5.1 is broken in example app)
Copy link

Choose a reason for hiding this comment

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

Question: Are there any implications to Django 5.1 being broken in example app? I understand that the package still "works" with 5.1?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@JakubMastalerz This was something I saw when I first tested the example app but I remember once i'd updated everything that problem went away and I think I forgot to update the comment here.
Do you see any issues with it when you run make sandbox
My feeling is that it was fixed when I made the changes in: sandbox/requirements.txt

- Drop support for Django 3.2
- Add support for Python 3.13 (testing)
- Drop support for Python 3.8
- Add support for Wagtail 6.3 (testing)
- Add support for Django 5.1


1.6.9 (2023-12-20)
Expand Down
4 changes: 2 additions & 2 deletions sandbox/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django>=3.2
Django>=4.2,<5.2
wagtail>=5.2
django-debug-toolbar==3.2.2
django-debug-toolbar==4.4.6
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The update here was because Django 5.1 needs a more recent version of debug toolbar

-e .[docs,test]
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 @@ -3,7 +3,7 @@
from setuptools import find_packages, setup

install_requires = [
"Django>=3.2",
"Django>=4.2,<5.2",
"Wagtail>=5.2",
"django-otp>=0.8.1",
"six>=1.14.0",
Expand Down Expand Up @@ -58,19 +58,19 @@
"Development Status :: 4 - Beta",
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Django :: 5.1",
"Framework :: Wagtail",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
"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",
"Programming Language :: Python :: 3.13",
],
zip_safe=False,
)
16 changes: 8 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
[tox]
envlist =
python{3.8,3.9,3.10}-django3.2-wagtail5.2
python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0,6.1}
python{3.11,3.12}-django5.0-wagtail{5.2,6.0,6.1}
python{3.9,3.10,3.11,3.12}-django4.2-wagtail{5.2,6.2,6.3}
python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.2,6.3}
python{3.10,3.11,3.12,3.13}-django5.1-wagtail6.3

[gh-actions]
python =
3.8: python3.8
3.9: python3.9
3.10: python3.10
3.11: python3.11
3.12: python3.12
3.13: python3.13

[testenv]
commands = coverage run --parallel -m pytest {posargs} -vvv

basepython =
python3.8: python3.8
python3.9: python3.9
python3.10: python3.10
python3.11: python3.11
python3.12: python3.12
python3.13: python3.13

deps =
django3.2: Django>=3.2,<4.0
django4.2: Django>=4.2,<4.3
django5.0: Django>=5.0,<5.1
django5.1: Django>=5.1,<5.2
wagtail5.2: wagtail>=5.2,<6.0
wagtail6.0: wagtail>=6.0,<6.1
wagtail6.1: wagtail>=6.1,<6.2
wagtail6.2: wagtail>=6.2,<6.3
wagtail6.3: wagtail>=6.3,<6.4

extras = test

Expand Down