Wagtail 7.2 maintenance (#75)

Author: zerolab

.github/workflows/publish.yml

@@ -10,13 +10,13 @@ jobs:
     permissions:
       contents: read # to fetch code (actions/checkout)
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.13'
+          python-version: '3.14'
           cache: "pip"
           cache-dependency-path: "**/pyproject.toml"
 

.github/workflows/ruff.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     # Keep in sync with .pre-commit-config.yaml
-    - run: python -Im pip install --user ruff==0.11.1
+    - run: python -Im pip install --user ruff==0.14.4
 
     - name: Run ruff
       working-directory: ./src

.github/workflows/test.yml

@@ -29,11 +29,11 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.12", "3.13"]
-        django: [ "4.2" ]
-        wagtail: [ "6.3" ]
+        django: [ "5.2" ]
+        wagtail: [ "7.0" ]
         database: [ "sqlite" ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         database: ["postgres"]
 
     services:
@@ -72,7 +72,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
@@ -104,7 +104,7 @@ jobs:
       - test-postgres
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           # Use latest Python, so it understands all syntax.

.pre-commit-config.yaml

@@ -2,11 +2,11 @@ ci:
   autofix_prs: false
 
 default_language_version:
-  python: python3.13
+  python: python3.14
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.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
     # keep in sync with .github/workflows/ruff.yml
-    rev: 'v0.11.1'
+    rev: 'v0.14.4'
     hooks:
-      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-check
+        args: [ --fix ]
       - id: ruff-format

CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+- Maintenance update for Wagtail 7.0, 7.1 & 7.2 compatibility
+
+## [0.12.2] - 2025-03-21
+
+- Current release

pyproject.toml

@@ -23,33 +23,35 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP :: Site Management",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "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.1",
+    "Framework :: Django :: 5.2",
     "Framework :: Wagtail",
     "Framework :: Wagtail :: 6",
+    "Framework :: Wagtail :: 7",
 ]
 
 dynamic = ["version"]
 requires-python = ">=3.9"
 dependencies = [
     "Wagtail>=6.3",
-    "python-docx>=0.8.10"
+    "python-docx>=1.2.0"
 ]
 
 [project.optional-dependencies]
 testing = [
     # Required for running the tests
-    "mock>=1.0.0",
+    "mock>=5.2.0",
     # For coverage and PEP8 linting
-    "coverage>=7.7.0",
-    "tox==4.11",
-    "dj-database-url>=2.3.0,<3.0"
+    "coverage>=7.11.3",
+    "tox>=4.32.0",
+    "dj-database-url>=3,<4"
 ]
 
 [project.urls]
@@ -62,9 +64,6 @@ Changelog = "https://github.com/torchbox/wagtail-content-import/blob/main/docs/r
 requires = ["flit_core >=3.11,<4"]
 build-backend = "flit_core.buildapi"
 
-[tool.flit.module]
-name = "wagtail_content_import"
-
 [tool.flit.sdist]
 exclude = [
     ".*",
@@ -75,8 +74,6 @@ exclude = [
     "*.yaml",
     "docs/",
     "tests/",
-    "wagtail_content_import/test/",
     "CHANGELOG.md",
     "ruff.toml",
-    "testmanage.py",
 ]

tox.ini

@@ -1,17 +1,18 @@
 [tox]
-min_version = 4.11
+min_version = 4.30.2
 
 envlist =
-    python{3.9,3.10,3.11}-django4.2-wagtail{6.3,6.4}-{sqlite,postgres}
-    python{3.10,3.11,3.12,3.13}-django5.1-wagtail{6.3,6.4,main}-{sqlite,postgres}
+    python{3.10,3.11}-django4.2-wagtail{6.3,7.0,7.1,7.2}-{sqlite,postgres}
+    python{3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0}-{sqlite,postgres}
+    python{3.14}-django{5.2}-wagtail{7.2,main}-{sqlite,postgres}
 
 [gh-actions]
 python =
-    3.9: python3.9
     3.10: python3.10
     3.11: python3.11
     3.12: python3.12
     3.13: python3.13
+    3.14: python3.14
 
 [gh-actions:env]
 DATABASE =
@@ -37,9 +38,12 @@ deps =
 
     django4.2: Django>=4.2,<5.0
     django5.1: Django>=5.1,<5.2
+    django5.2: Django>=5.2,<5.3
 
     wagtail6.3: wagtail>=6.3,<6.4
-    wagtail6.4: wagtail>=6.4,<6.5
+    wagtail7.0: wagtail>=7.0,<7.1
+    wagtail7.1: wagtail>=7.1,<7.2
+    wagtail7.2: wagtail>=7.2,<7.3
     wagtailmain: git+https://github.com/wagtail/wagtail.git
 
     postgres: psycopg