Wagtail 7.0+ maintenance (#18)

Author: zerolab

.github/workflows/ruff.yml

@@ -10,14 +10,15 @@ on:
 
 jobs:
   ruff:
+    name: Ruff
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
 
     # Keep in sync with .pre-comit-config.yaml
-    - run: python -Im pip install --user ruff==0.4.9
+    - run: python -Im pip install --user ruff==0.15.16
 
     - name: Run ruff
       working-directory: ./src
-      run: ruff --output-format=github wagtailmath
+      run: ruff check --output-format=github wagtailmath

.github/workflows/test.yml

@@ -16,24 +16,11 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - uses: pre-commit/action@v3.0.1
-
   test-sqlite:
     runs-on: ubuntu-latest
-    needs: lint
     strategy:
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
       - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -20,8 +20,8 @@ repos:
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # ruff config is in ruff.toml. Keep in sync with .github/workflows/ruff.yml
-    rev: v0.4.9
+    rev: v0.15.16
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
       - id: ruff-format

pyproject.toml

@@ -5,6 +5,7 @@ build-backend = "flit_core.buildapi"
 [project]
 name = "wagtailmath"
 authors = [{name = "James Ramm", email = "jamessramm@gmail.com"}]
+maintainers = [{name = "Wagtail Nest team", email = "hello@wagtail.org"}]
 description = "Wagtail StreamField block for rendering mathematical equations"
 readme = "README.md"
 license = {file = "LICENSE"}
@@ -15,35 +16,35 @@ 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",
+    "Programming Language :: Python :: 3.14",
     "Framework :: Django",
     "Framework :: Django :: 4.2",
-    "Framework :: Django :: 5.0",
+    "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
     "Framework :: Wagtail",
-    "Framework :: Wagtail :: 5",
-    "Framework :: Wagtail :: 6",
+    "Framework :: Wagtail :: 7",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dynamic = ["version"]
 dependencies = [
     "Django>=4.2",
-    "Wagtail>=5.2"
+    "Wagtail>=7.0"
 ]
 [project.optional-dependencies]
-linting = ["pre-commit>=3.6.0,<4",]
+linting = ["pre-commit>=4.6.0,<5",]
 testing = [
-    "dj-database-url==2.1.0",
-    "pytest==8.1.1",
-    "pytest-cov==5.0.0",
-    "pytest-django==4.8.0",
+    "dj-database-url==3.1.2",
+    "pytest==9.0.3",
+    "pytest-cov==7.1.0",
+    "pytest-django==4.12.0",
 ]
 ci = [
-    "tox>=4.15.1,<5",
-    "tox-gh-actions>=3.2,<3.3",
+    "tox>=4.55.1,<5",
+    "tox-gh-actions>=3.5,<4",
 ]
 
 [project.urls]

src/wagtailmath/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.0"
+__version__ = "1.3.1"

src/wagtailmath/models.py

@@ -1,53 +1,25 @@
 from django import forms
-from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail.admin.staticfiles import versioned_static
 
 
 MATHJAX_VERSION = "2.7.9"
 
 
-class MathJaxWidgetBase(forms.Textarea):
+class MathJaxWidget(forms.Textarea):
     template_name = "wagtailmath/mathjaxwidget.html"
 
-    def _get_media_js(self):
-        return (
-            f"https://cdnjs.cloudflare.com/ajax/libs/mathjax/{MATHJAX_VERSION}/MathJax.js?config=TeX-MML-AM_HTMLorMML",
-            versioned_static("wagtailmath/js/wagtailmath.js"),
-        )
+    def build_attrs(self, *args, **kwargs):
+        attrs = super().build_attrs(*args, **kwargs)
+        attrs["data-controller"] = "wagtailmathjax"
+
+        return attrs
 
     @property
     def media(self):
-        return forms.Media(js=self._get_media_js())
-
-
-if WAGTAIL_VERSION >= (6, 0):
-
-    class MathJaxWidget(MathJaxWidgetBase):
-        def build_attrs(self, *args, **kwargs):
-            attrs = super().build_attrs(*args, **kwargs)
-            attrs["data-controller"] = "wagtailmathjax"
-
-            return attrs
-
-        def _get_media_js(self):
-            return (
-                *super()._get_media_js(),
+        return forms.Media(
+            js=(
+                f"https://cdnjs.cloudflare.com/ajax/libs/mathjax/{MATHJAX_VERSION}/MathJax.js?config=TeX-MML-AM_HTMLorMML",
+                versioned_static("wagtailmath/js/wagtailmath.js"),
                 versioned_static("wagtailmath/js/wagtailmath-mathjax-controller.js"),
             )
-else:
-    from wagtail.telepath import register
-    from wagtail.utils.widgets import WidgetWithScript
-    from wagtail.widget_adapters import WidgetAdapter
-
-    class MathJaxWidget(WidgetWithScript, MathJaxWidgetBase):
-        def render_js_init(self, id_, name, value):
-            return f'initMathJaxPreview("{id_}");'
-
-    class MathJaxAdapter(WidgetAdapter):
-        js_constructor = "wagtailmath.widgets.MathJaxWidget"
-
-        class Media:
-            # TODO: remove the adapter when dropping support for Wagtail 5.2
-            js = ["wagtailmath/js/mathjax-textarea-adapter.js"]
-
-    register(MathJaxAdapter(), MathJaxWidget)
+        )

src/wagtailmath/static/wagtailmath/js/mathjax-textarea-adapter.js

@@ -1,17 +1,19 @@
 [tox]
-min_version = 4.11
+min_version = 4.30
 
 envlist =
-    python{3.8,3.9,3.10,3.11}-django{4.2}-wagtail{5.2,6.1}-{sqlite}
-    python{3.10,3.11,3.12}-django{5.0}-wagtail{5.2,6.1}-{sqlite}
+    python{3.10}-django{4.2}-wagtail{7.0}-{sqlite}
+    python{3.11,3.12}-django{5.2}-wagtail{7.0,7.4}-{sqlite}
+    python{3.13,3.14}-django{6.0}-wagtail{7.4}-{sqlite}
+    python{3.14}-django{6.0}-wagtail{main}-{sqlite}
 
 [gh-actions]
 python =
-    3.8: python3.8
-    3.9: python3.9
     3.10: python3.10
     3.11: python3.11
     3.12: python3.12
+    3.13: python3.13
+    3.14: python3.14
 
 [testenv]
 package = wheel
@@ -34,10 +36,12 @@ deps =
     coverage>=7.0,<8.0
 
     django4.2: Django>=4.2,<4.3
-    django5.0: Django>=5.0,<5.1
+    django5.2: Django>=5.2,<5.3
+    django6.0: Django>=6.0,<6.1
 
-    wagtail5.2: wagtail>=5.2,<5.3
-    wagtail6.1: wagtail>=6.1,<6.2
+    wagtail7.0: wagtail>=7.0,<7.1
+    wagtail7.3: wagtail>=7.3,<7.4
+    wagtail7.4: wagtail>=7.4,<7.5
 
 extras = testing
 
@@ -53,7 +57,7 @@ basepython = python3.12
 package = editable
 
 deps =
-    wagtail >= 5.2, <6.0
+    wagtail >= 7.0, < 7.1
 
 commands_pre =
     python {toxinidir}/tests/manage.py makemigrations