Merge pull request #4 from torchbox-forks/support/wagtail-52

Wagtail 5.2

.github/workflows/tests.yml

@@ -6,34 +6,21 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
-    name: |
-      build (Python ${{ matrix.python-version }},
-      Django ${{ matrix.django-version }},
-      Wagtail ${{ matrix.wagtail-version }}),
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
-        django-version: ["3.2", "4.1", "4.2"]
-        wagtail-version: ["4.1", "4.2", "5.0"]
-        exclude:
-          - python-version: "3.8"
-            django-version: "4.2"
-          - python-version: "3.9"
-            django-version: "4.2"
-          - python-version: "3.10"
-            django-version: "4.2"
-          - python-version: "3.11"
-            django-version: "3.2"
-          - python-version: "3.11"
-            wagtail-version: "4.1"
-          - python-version: "3.11"
-            wagtail-version: "4.2"
-          - django-version: "3.2"
-            wagtail-version: "5.0"
+        python: ["3.8", "3.9", "3.10", "3.11"]
+
     steps:
       - uses: actions/checkout@v3
 

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 5.1+
+- Drop tests for Wagtail 4.2 and 5.0 as they have reached EOL
+
 ## 1.0.1 (2023-07-27)
 
 - Adds support for Wagtail 5.0

setup.cfg

@@ -13,13 +13,13 @@ license_files =
   LICENSE.txt
 
 [options]
-python_requires = >= 3.7
+python_requires = >= 3.8
 setup_requires =
   setuptools >= 40.6
   pip >= 10
 include_package_data = true
 packages = find:
 install_requires =
-    Django>=3.2, <4.2
-    wagtail>=4.1, <5.0
+    Django>=3.2
+    wagtail>=4.1
     python-unsplash>=1.1.0, <1.2

tox.ini

@@ -13,16 +13,17 @@ DJANGO =
 
 WAGTAIL =
     4.1: wt41
-    4.2: wt42
-    5.0: wt50
+    5.1: wt51
+    5.2: wt52
 
 [tox]
 skipsdist = True
 usedevelop = True
 
 envlist =
-    py{38,39,310}-dj{32,41}-wt{41,42,50}
-    py{311}-dj{41,42}-wt{50}
+    py{38,39,310}-dj{32,41}-wt{41,51,52}
+    py311-dj41-wt{41,51,52}
+    py311-dj42-wt{51,52}
 
 [testenv]
 description = Unit tests
@@ -40,5 +41,5 @@ deps =
     dj41: Django>=4.1,<4.2
     dj42: Django>=4.2,<4.3
     wt41: wagtail>=4.1,<4.2
-    wt42: wagtail>=4.2,<5.0
-    wt50: wagtail>=5.0,<5.1
+    wt51: wagtail>=5.1,<5.2
+    wt52: wagtail>=5.2,<5.3