Wagtail 6.1

CHANGELOG.rst

@@ -1,6 +1,9 @@
 Unreleased
 ----------
 
+* Add tests for Wagtail 6.1 (@katdom13)
+* Drop support for Django < 4.2 (@katdom13)
+
 1.1.0 - 8th March 2024
 ----------------------
 * Drop support for Wagtail < 5.2 (@katdom13)
@@ -21,7 +24,7 @@ Unreleased
 * Removed code conditionals (@katdom13)
 
 1.0.0rc1 - 11th October 2022
-----------
+----------------------------
 * Support Wagtail 4 (#33 - @nickmoreton)
 * Avoid unnecessary cache purges (#34 - @ababic)
 

setup.cfg

@@ -18,7 +18,6 @@ classifiers =
     Programming Language :: Python :: 3.12
     Topic :: Internet :: WWW/HTTP
     Framework :: Django
-    Framework :: Django :: 3.2
     Framework :: Django :: 4.2
     Framework :: Django :: 5.0
     Framework :: Wagtail
@@ -44,10 +43,10 @@ exclude =
 
 [options.extras_require]
 testing =
-    coverage ==5.0.3
-    factory_boy ==2.12.0
-    moto ==3.1.8
-    black ==22.3.0
+    coverage ==7.5.2
+    factory_boy ==3.3.0
+    moto ==5.0.8
+    black ==24.4.2
     isort
     flake8
 

tox.ini

@@ -1,8 +1,7 @@
 [tox]
 envlist =
-    py{38,39,310}-dj32-wagtail52
-    py{38,39,310,311}-dj42-wagtail{52,60}
-    py{311,312}-dj50-wagtail{52,60}
+    py{38,39,310,311}-dj42-wagtail{52,60,61}
+    py{310,311,312}-dj50-wagtail{52,60,61}
     flake8
     isort
     black
@@ -20,11 +19,11 @@ setenv =
     PYTHONPATH = {toxinidir}
     DJANGO_SETTINGS_MODULE = wagtail_storages.tests.settings
 deps =
-    dj32: Django>=3.2,<4.0
     dj42: Django>=4.2,<4.3
     dj50: Django>=5.0,<5.1
     wagtail52: wagtail>=5.2,<5.3
     wagtail60: wagtail>=6.0,<6.1
+    wagtail61: wagtail>=6.1,<6.2
     wagtailmain: git+https://github.com/wagtail/wagtail.git@main#egg=Wagtail
 
 install_command = pip install -U {opts} {packages}

wagtail_storages/tests/base.py

@@ -1,10 +1,10 @@
 from django.conf import settings
 
 import boto3
-from moto import mock_s3
+from moto import mock_aws
 
 
-@mock_s3
+@mock_aws
 class CreateBucket:
     def setUp(self):
         bucket_name = settings.AWS_STORAGE_BUCKET_NAME

wagtail_storages/tests/test_protected_documents.py

@@ -3,14 +3,14 @@
 from django.test import TestCase
 from django.urls import reverse
 
-from moto import mock_s3
+from moto import mock_aws
 
 from wagtail_storages.factories import CollectionViewRestrictionFactory, DocumentFactory
 from wagtail_storages.tests.base import CreateBucket
 from wagtail_storages.tests.utils import is_s3_object_is_public
 
 
-@mock_s3
+@mock_aws
 class AmazonS3DocumentTests(CreateBucket, TestCase):
     def check_s3_url(self, url):
         return "s3.amazonaws.com" in url or "media.torchbox.com" in url

wagtail_storages/tests/test_signal_handlers.py

@@ -5,7 +5,7 @@
 from django.test import TestCase, override_settings
 
 import factory
-from moto import mock_s3
+from moto import mock_aws
 
 from wagtail_storages.factories import (
     CollectionFactory,
@@ -39,7 +39,7 @@ def test_skipping_s3_storage_decorator_with_s3_storage(self):
         mock.assert_called_once()
 
 
-@mock_s3
+@mock_aws
 class TestUpdateDocumentAclsWhenCollectionSaved(CreateBucket, TestCase):
     @factory.django.mute_signals(post_save)
     def test_s3_object_acl_set_to_public(self):
@@ -60,7 +60,7 @@ def test_s3_object_acl_set_to_private(self):
         self.assertFalse(is_s3_object_is_public(document.file.file.obj))
 
 
-@mock_s3
+@mock_aws
 class TestUpdateDocumentAclsWhenDocumentSaved(CreateBucket, TestCase):
     @factory.django.mute_signals(post_save)
     def test_s3_object_acl_set_to_public(self):
@@ -80,7 +80,7 @@ def test_s3_object_acl_set_to_private(self):
         self.assertFalse(is_s3_object_is_public(document.file.file.obj))
 
 
-@mock_s3
+@mock_aws
 class TestPurgeDocumentsWhenCollectionSavedWithRestrictions(CreateBucket, TestCase):
     @override_settings(
         WAGTAILFRONTENDCACHE={
@@ -135,7 +135,7 @@ def test_cache_not_purged_for_public_collection(self):
         urlopen_mock.assert_not_called()
 
 
-@mock_s3
+@mock_aws
 class TestPurgeDocumentFromCacheWhenSaved(CreateBucket, TestCase):
     @override_settings(
         WAGTAILFRONTENDCACHE={

wagtail_storages/tests/test_wagtail_hooks.py

@@ -2,14 +2,14 @@
 
 from django.test import RequestFactory, TestCase, override_settings
 
-from moto import mock_s3
+from moto import mock_aws
 
 from wagtail_storages.factories import CollectionViewRestrictionFactory, DocumentFactory
 from wagtail_storages.tests.base import CreateBucket
 from wagtail_storages.wagtail_hooks import serve_document_from_s3
 
 
-@mock_s3
+@mock_aws
 class TestWagtailHooks(CreateBucket, TestCase):
     @override_settings(
         DEFAULT_FILE_STORAGE="django.core.files.storage.FileSystemStorage"