Wagtail 6.2 testing

.pre-commit-config.yaml

@@ -3,17 +3,17 @@ default_language_version:
   python: python3.12
 repos:
   - repo: https://github.com/python/black
-    rev: 23.1.0
+    rev: 24.4.2
     hooks:
       - id: black
         exclude: migrations/
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
   - repo: https://github.com/pycqa/flake8
     # flake8 config is in setup.cfg
-    rev: 3.8.3
+    rev: 7.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/mirrors-prettier

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+- Add tests for Wagtail 6
+- Drop support for Django < 4.2
+
 ## 1.1.0 (2024-03-11)
 
 - Add tests for Wagtail 5.1+

setup.cfg

@@ -15,11 +15,11 @@ license_files =
 [options]
 python_requires = >= 3.8
 setup_requires =
-  setuptools >= 40.6
-  pip >= 10
+  setuptools >= 70.0.0
+  pip >= 24.0
 include_package_data = true
 packages = find:
 install_requires =
-    Django>=3.2
+    Django>=4.2
     wagtail>=5.2
-    python-unsplash>=1.1.0, <1.2
+    python-unsplash>=1.2.5

setup.py

@@ -13,7 +13,7 @@
     long_description = f.read()
 
 testing_extras = [
-    "coverage>=4.5",
+    "coverage>=7.5.2",
 ]
 
 setup(
@@ -27,13 +27,12 @@
     license="MIT",
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
-    install_requires=["wagtail>=5.2", "python-unsplash>=1.1.0"],
+    install_requires=["wagtail>=5.2", "python-unsplash>=1.2.5"],
     extras_require={"testing": testing_extras},
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Environment :: Web Environment",
         "Framework :: Django",
-        "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.2",
         "Framework :: Django :: 5.0",
         "Framework :: Wagtail",

tox.ini

@@ -8,22 +8,22 @@ python =
 
 [gh-actions:env]
 DJANGO =
-    3.2: dj32
     4.2: dj42
     5.0: dj50
 
 WAGTAIL =
     5.2: wt52
     6.0: wt60
+    6.1: wt61
+    6.2: wt62
 
 [tox]
 skipsdist = True
 usedevelop = True
 
 envlist =
-    py{38,39,310}-dj32-wt52
-    py{38,39,310,311}-dj42-wt{52,60}
-    py{311,312}-dj50-wt{52,60}
+    py{38,39,310,311}-dj42-wt{52,60,61,62}
+    py{310,311,312}-dj50-wt{52,60,61,62}
 
 [testenv]
 description = Unit tests
@@ -38,8 +38,9 @@ basepython =
     py312: python3.12
 
 deps =
-    dj32: Django>=3.2,<4.0
     dj42: Django>=4.2,<4.3
     dj50: Django>=5.0,<5.1
     wt52: wagtail>=5.2,<5.3
     wt60: wagtail>=6.0,<6.1
+    wt61: wagtail>=6.1,<6.2
+    wt62: wagtail>=6.2,<6.3

wagtailmakeup/tests/settings.py

@@ -47,7 +47,6 @@
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "wagtail.core.middleware.SiteMiddleware",
 ]
 
 ROOT_URLCONF = "wagtailmakeup.tests.urls"