Merge pull request #17 from torchbox-forks/support/wagtail61

Wagtail 6.1
torchbox-forks · May 20, 2024 · c123bcb · c123bcb
2 parents 6977243 + dcf18c2
commit c123bcb
Show file tree

Hide file tree

Showing 6 changed files with 170 additions and 201 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,8 +4,9 @@ Changelog
 Unreleased
 ----------
 
-- Drop testing for Wagtail version before 4.1
-- Add testing for Wagtail versions 5.2 and 6.0
+- 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)
 ------------------

diff --git a/Makefile b/Makefile
@@ -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 {} +

diff --git a/setup.py b/setup.py
@@ -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
@@ -52,11 +52,9 @@
         "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 :: 4",
         "Framework :: Wagtail :: 5",
         "Framework :: Wagtail :: 6",
         "Topic :: Internet :: WWW/HTTP",