Merge pull request #72 from gasman/wagtail-6.3

Wagtail 6.3 support

Author: gasman

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.8.0 (xx.xx.xxxx)
+
+* Add support for Wagtail 6.1 - 6.3 (Matt Westcott)
+* Update testing to include Python 3.13, Django 5.1 (Matt Westcott)
+* Drop support for Python 3.8 (Matt Westcott)
+
 ## 0.7.0 (06.02.2024)
 
 * Add support for Wagtail 5.2 (Josh Munn)

pyproject.toml

@@ -16,14 +16,15 @@ classifiers=[
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Framework :: Django",
     "Framework :: Django :: 4",
     "Framework :: Django :: 5.0",
+    "Framework :: Django :: 5.1",
     "Framework :: Wagtail",
     "Framework :: Wagtail :: 5",
     "Framework :: Wagtail :: 6",

tox.ini

@@ -1,19 +1,23 @@
 [tox]
 envlist =
-    python{3.8,3.9,3.10,3.11,3.12}-django{4.2,5.0}-wagtail{5.2,6.0}
+    python{3.9,3.10,3.11,3.12,3.13}-django{4.2,5.0,5.1}-wagtail{5.2,6.0,6.1,6.2,6.3}
 
 [testenv]
 commands = python runtests.py
 
 basepython =
-    python3.8: python3.8
     python3.9: python3.9
     python3.10: python3.10
     python3.11: python3.11
     python3.12: python3.12
+    python3.13: python3.13
 
 deps =
     django4.2: Django>=4.2,<5.0
     django5.0: Django>=5.0,<5.1
+    django5.0: Django>=5.1,<5.2
     wagtail5.2: wagtail>=5.2,<6.0
-    wagtail6.0: wagtail>=6.0rc1,<6.1
+    wagtail6.0: wagtail>=6.0,<6.1
+    wagtail6.1: wagtail>=6.1,<6.2
+    wagtail6.2: wagtail>=6.2,<6.3
+    wagtail6.3: wagtail>=6.3,<6.4

wagtail_airtable/mixins.py

@@ -5,6 +5,7 @@
 from airtable import Airtable
 from django.conf import settings
 from django.db import models
+from django.middleware.csrf import get_token
 from django.urls import reverse
 from django.utils.functional import cached_property
 from requests import HTTPError
@@ -369,11 +370,16 @@ class Meta:
 class ImportButton(Button):
     template_name = "wagtail_airtable/_import_button.html"
 
+    def __init__(self, *args, request=None, model_opts = None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.request = request
+        self.model_opts = model_opts
+
     def get_context_data(self, parent_context):
         context = super().get_context_data(parent_context)
-        context["csrf_token"] = parent_context["csrf_token"]
-        context["model_opts"] = parent_context["model_opts"]
-        context["next"] = parent_context["request"].path
+        context["csrf_token"] = get_token(self.request)
+        context["model_opts"] = self.model_opts
+        context["next"] = self.request.path
         return context
 
 
@@ -386,7 +392,9 @@ def header_buttons(self):
             buttons.append(
                 ImportButton(
                     "Import from Airtable",
-                    url=reverse("airtable_import_listing")
+                    url=reverse("airtable_import_listing"),
+                    request=self.request,
+                    model_opts=self.model and self.model._meta,
                 )
             )
         return buttons