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.

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.0 Update #58

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
82 changes: 17 additions & 65 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,83 +7,35 @@ cache:
matrix:
# See `Which version combinations to include in Travis test matrix?` in `/docs/README.md`.
include:
- env: TOXENV=py38-dj32-wt41
- env: TOXENV=py38-dj42-wt52
python: 3.8
- env: TOXENV=py38-dj32-wt42
- env: TOXENV=py38-dj42-wt60
python: 3.8
- env: TOXENV=py38-dj32-wt50
- env: TOXENV=py38-dj42-wt61
python: 3.8
- env: TOXENV=py38-dj32-wt51
python: 3.8
- env: TOXENV=py38-dj32-wt52
python: 3.8
- env: TOXENV=py38-dj41-wt41
python: 3.8
- env: TOXENV=py38-dj41-wt42
python: 3.8
- env: TOXENV=py38-dj41-wt50
python: 3.8
- env: TOXENV=py38-dj41-wt51
python: 3.8
- env: TOXENV=py38-dj41-wt52
python: 3.8
- env: TOXENV=py39-dj32-wt41
python: 3.9
- env: TOXENV=py39-dj32-wt42
- env: TOXENV=py39-dj42-wt52
python: 3.9
- env: TOXENV=py39-dj32-wt50
- env: TOXENV=py39-dj42-wt60
python: 3.9
- env: TOXENV=py39-dj32-wt51
- env: TOXENV=py39-dj42-wt61
python: 3.9
- env: TOXENV=py39-dj32-wt52
python: 3.9
- env: TOXENV=py39-dj41-wt41
python: 3.9
- env: TOXENV=py39-dj41-wt42
python: 3.9
- env: TOXENV=py39-dj41-wt50
python: 3.9
- env: TOXENV=py39-dj41-wt51
python: 3.9
- env: TOXENV=py39-dj41-wt52
python: 3.9
- env: TOXENV=py310-dj32-wt41
python: 3.10
- env: TOXENV=py310-dj32-wt42
- env: TOXENV=py310-dj42-wt52
python: 3.10
- env: TOXENV=py310-dj32-wt50
- env: TOXENV=py310-dj42-wt60
python: 3.10
- env: TOXENV=py310-dj32-wt51
- env: TOXENV=py310-dj42-wt61
python: 3.10
- env: TOXENV=py310-dj32-wt52
python: 3.10
- env: TOXENV=py310-dj41-wt41
python: 3.10
- env: TOXENV=py310-dj41-wt42
python: 3.10
- env: TOXENV=py310-dj41-wt50
python: 3.10
- env: TOXENV=py310-dj41-wt51
python: 3.10
- env: TOXENV=py310-dj41-wt52
python: 3.10
- env: TOXENV=py311-dj41-wt41
python: 3.11
- env: TOXENV=py311-dj41-wt42
python: 3.11
- env: TOXENV=py311-dj41-wt50
python: 3.11
- env: TOXENV=py311-dj41-wt51
python: 3.11
- env: TOXENV=py311-dj41-wt52
- env: TOXENV=py311-dj42-wt52
python: 3.11
- env: TOXENV=py311-dj42-wt50
- env: TOXENV=py311-dj42-wt60
python: 3.11
- env: TOXENV=py311-dj42-wt51
- env: TOXENV=py311-dj42-wt61
python: 3.11
- env: TOXENV=py311-dj42-wt52
python: 3.11
- env: TOXENV=py312-dj42-wt52
- env: TOXENV=py312-dj50-wt52
python: 3.12
- env: TOXENV=py312-dj50-wt60
python: 3.12
- env: TOXENV=py312-dj50-wt61
python: 3.12
install:
- pip install tox coveralls
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changelog
=========

Unreleased
----------

- Drop support for Wagtail < 5.2
- Add testing for Wagtail versions 5.2, 6.0, and 6.1
- Drop support for Django < 4.2

2.1.1 (2024-01-26)
------------------
#. Added tests for Wagtail 5.2
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ test-ci: ## Continuous integration test suite.
tox

update-test-fixture: ## Update test fixture from the db.
python ./tests/testapp/manage.py dumpdata --indent=4 -e contenttypes -e auth.permission -e auth.group -e sessions -e wagtailcore.site -e wagtailcore.pagerevision -e wagtailcore.grouppagepermission -e wagtailimages.rendition -e wagtailcore.collection -e wagtailcore.groupcollectionpermission > tests/testapp/fixtures/test_data.json
python ./tests/testapp/manage.py dumpdata --indent=4 \
-e contenttypes -e auth.permission -e auth.group -e sessions \
-e wagtailcore.site -e wagtailcore.revision -e wagtailcore.grouppagepermission \
-e wagtailimages.rendition -e wagtailcore.collection -e wagtailcore.groupcollectionpermission \
-e wagtailcore.locale \
-e wagtailcore.workflowpage -e wagtailcore.workflowtask -e wagtailcore.task -e wagtailcore.workflow -e wagtailcore.groupapprovaltask \
> tests/testapp/home/fixtures/test_data.json

clean-pyc: ## Remove Python file artifacts.
find . -name '*.pyc' -exec rm -f {} +
Expand Down
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"flake8>=5.0.4,<5.1",
"isort>=5.10.1",
# For test site
"wagtail>=4.1",
"wagtail>=5.2",
]

# Documentation dependencies
Expand Down Expand Up @@ -52,13 +52,11 @@
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 3",
"Framework :: Wagtail :: 4",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
],
Expand Down
Loading
Loading