Merge pull request #3 from overcastsoftware/test-matrix-upgrade-wagtail5

Adding more versions to the test matrix, removing support for wagtail<3

.github/workflows/django.yml

@@ -14,7 +14,17 @@ jobs:
       matrix:
         include:
           - python: '3.10'
-            wagtail: 'wagtail>=4.1'
+            wagtail: 'wagtail<5.2'
+          - python: '3.11'
+            wagtail: 'wagtail<5.2'
+          - python: '3.10'
+            wagtail: 'wagtail<5.1'
+          - python: '3.11'
+            wagtail: 'wagtail<5.1'
+          - python: '3.10'
+            wagtail: 'wagtail<4.3'
+          - python: '3.11'
+            wagtail: 'wagtail<4.3'
 
     runs-on: 'ubuntu-latest'
 

Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Python runtime as a parent image
-FROM python:3.8-bullseye
+FROM python:3.10-bullseye
 LABEL maintainer="[email protected]"
 
 # Set environment varibles

wagtailtables/blocks.py

@@ -4,17 +4,10 @@
 from django.utils.functional import cached_property
 
 from wagtail.telepath import register
-from wagtail import VERSION
 
-# Backwards compatibility
-if VERSION[0] < 3:
-    from wagtail.blocks.struct_block import StructBlockAdapter
-    from wagtail.blocks import (BooleanBlock, CharBlock, ChoiceBlock,
-                                 StructBlock, TextBlock)
-else:
-    from wagtail.blocks.struct_block import StructBlockAdapter
-    from wagtail.blocks import (BooleanBlock, CharBlock, ChoiceBlock,
-                                 StructBlock, TextBlock)
+from wagtail.blocks.struct_block import StructBlockAdapter
+from wagtail.blocks import (BooleanBlock, CharBlock, ChoiceBlock,
+                                StructBlock, TextBlock)
 
 TOOLBAR = [
     {'type': 'i','content': 'format_align_left', 'k': 'text-align', 'v': 'left'},

wagtailtables_demo/requirements.txt

@@ -1,5 +1,5 @@
-Django>=4.0,<4.1
-wagtail==5.1.2
+Django>=4.0,<4.3
+wagtail<5.2
 dj-database-url==0.4.1
 psycopg2-binary>=2.7,<3.0
 debugpy==1.5.1