Support for Wagtail 4.0, 4.1, 4.2

wagtail-nest · Dec 2, 2024 · 1a0ccb2 · 1a0ccb2
1 parent f9bd1ea
commit 1a0ccb2
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 72 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,30 +47,8 @@ jobs:
     strategy:
       matrix:
         python: ['3.8', '3.9', '3.10']
-        django: ['3.2', '4.0']
-        wagtail: ['2.16', '3.0', '4.0']
-        include:
-          - wagtail: '2.15'
-            django: '3.2'
-            python: '3.7'
-          - wagtail: '2.15'
-            django: '3.2'
-            python: '3.8'
-          - wagtail: '2.15'
-            django: '3.2'
-            python: '3.9'
-          - wagtail: '2.15'
-            django: '3.2'
-            python: '3.10'
-          - wagtail: '4.0'
-            django: '4.1'
-            python: '3.8'
-          - wagtail: '4.0'
-            django: '4.1'
-            python: '3.9'
-          - wagtail: '4.0'
-            django: '4.1'
-            python: '3.10'
+        django: ['3.2', '4.1']
+        wagtail: ['4.0', '4.1', '4.2']
 
     steps:
       - uses: actions/checkout@v3
@@ -92,38 +70,9 @@ jobs:
     strategy:
       matrix:
         python: ['3.8', '3.9', '3.10']
-        django: ['3.2', '4.0']
-        wagtail: ['2.16', '3.0', '4.0']
+        django: ['3.2', '4.1']
+        wagtail: ['4.0', '4.1', '4.2']
         postgres: ['10.8']
-        include:
-          - wagtail: '2.15'
-            django: '3.2'
-            postgres: '10.8'
-            python: '3.7'
-          - wagtail: '2.15'
-            django: '3.2'
-            postgres: '10.8'
-            python: '3.8'
-          - wagtail: '2.15'
-            django: '3.2'
-            postgres: '10.8'
-            python: '3.9'
-          - wagtail: '2.15'
-            django: '3.2'
-            postgres: '10.8'
-            python: '3.10'
-          - wagtail: '4.0'
-            django: '4.1'
-            postgres: '10.8'
-            python: '3.8'
-          - wagtail: '4.0'
-            django: '4.1'
-            postgres: '10.8'
-            python: '3.9'
-          - wagtail: '4.0'
-            django: '4.1'
-            postgres: '10.8'
-            python: '3.10'
 
     services:
       postgres:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,13 @@ 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] - YYYY-MM-DD
+## [0.3.0] - YYYY-MM-DD
 
 - Add Django 4.1 and Python 3.10 classifier to PyPI _Joren Hammudoglu_
 - Add Django 4.1 support to CI _Joren Hammudoglu_
 - Add support for Wagtail 4 _Katherine Domingo_
+- Update URL route names for docs and images to work on Wagtail 4 _Cynthia Kiser_
+- Drop support for Wagtail < 4.0 _Cynthia Kiser_
 
 ## [0.2.0] - 2024-12-02
 

diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@ This is the legacy rich text editor for the Wagtail CMS. Based on [Hallo.js](htt
 
 ## Supported Versions
 
-- Python 3.7, 3.8, 3.9 3.10
-- Django 3.2. 4.0
-- Wagtail 2.15, 2.16, 3.0
+- Python 3.7, 3.8, 3.9, 3.10, 3.11
+- Django 3.2, 4.0, 4.1
+- Wagtail 4.0, 4.1, 4.2
 
 ## Installing the Hallo Editor
 

diff --git a/setup.py b/setup.py
@@ -34,18 +34,17 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Framework :: Django",
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.0",
         "Framework :: Django :: 4.1",
         "Framework :: Wagtail",
-        "Framework :: Wagtail :: 2",
-        "Framework :: Wagtail :: 3",
         "Framework :: Wagtail :: 4",
     ],
     install_requires=[
         "Django>=3.2,<4.2",
-        "Wagtail>=2.15,<4.1",
+        "Wagtail>=4.0,<5.0",
     ],
     extras_require={
         "testing": ["dj-database-url==0.5.0", "freezegun==0.3.15"],

diff --git a/tox.ini b/tox.ini
@@ -3,9 +3,9 @@ skipsdist = True
 usedevelop = True
 
 envlist =
-    python{3.7,3.8,3.9,3.10}-django{3.2}-wagtail{2.15,2.16,3.0,4.0,main}-{sqlite,postgres}
-    python{3.8,3.9,3.10}-django{4.0}-wagtail{2.16,3.0,4.0,main}-{sqlite,postgres}
-    python{3.8,3.9,3.10}-django{4.1,main}-wagtail{4.0,main}-{sqlite,postgres}
+    python{3.7,3.8,3.9,3.10}-django{3.2}-wagtail{4.0,4.1,4.2}-{sqlite,postgres}
+    python{3.7,3.8,3.9,3.10}-django{4.0}-wagtail{4.0,4.1,4.2}-{sqlite,postgres}
+    python{3.7,3.8,3.9,3.10}-django{4.1}-wagtail{4.0,4.1,4.2}-{sqlite,postgres}
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -25,10 +25,9 @@ deps =
     django4.1: Django>=4.1,<4.2
     djangomain: git+https://github.com/django/django.git@main#egg=Django
 
-    wagtail2.15: wagtail>=2.15,<2.16
-    wagtail2.16: wagtail>=2.16,<3.0
-    wagtail3.0: wagtail>=3.0,<3.1
     wagtail4.0: wagtail>=4.0,<4.1
+    wagtail4.1: wagtail>=4.1,<4.2
+    wagtail4.2: wagtail>=4.2,<5.0
     wagtailmain: git+https://github.com/wagtail/wagtail.git
 
     postgres: psycopg2>=2.6

diff --git a/wagtail_hallo/__init__.py b/wagtail_hallo/__init__.py
@@ -41,6 +41,6 @@ def get_complete_version(version):
     return version
 
 
-VERSION = (0, 2, 0)
+VERSION = (0, 3, 0)
 
 __version__ = ".".join(map(str, VERSION))
diff --git a/wagtail_hallo/static/js/hallo-plugins/hallo-wagtaildoclink.js b/wagtail_hallo/static/js/hallo-plugins/hallo-wagtaildoclink.js
@@ -31,7 +31,7 @@
           url: window.chooserUrls.documentChooser,
           onload: DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS,
           responses: {
-            documentChosen: function (docData) {
+            chosen: function (docData) {
               var link;
 
               link = document.createElement('a');

diff --git a/wagtail_hallo/static/js/hallo-plugins/hallo-wagtailimage.js b/wagtail_hallo/static/js/hallo-plugins/hallo-wagtailimage.js
@@ -35,7 +35,7 @@
           url: window.chooserUrls.imageChooser + '?select_format=true',
           onload: IMAGE_CHOOSER_MODAL_ONLOAD_HANDLERS,
           responses: {
-            imageChosen: function (imageData) {
+            chosen: function (imageData) {
               var elem;
 
               elem = $(imageData.html).get(0);

diff --git a/wagtail_hallo/static/js/vendor/hallo.js b/wagtail_hallo/static/js/vendor/hallo.js
@@ -3242,7 +3242,7 @@
         // Wagtail 4.
         this.toolbar.css(
           'top',
-          this.element.offset().top - this.toolbar.outerHeight(),
+          this.element.offset().top - this.toolbar.outerHeight() + 44,
         );
         if (this.options.affix) {
           scrollTop = jQuery(window).scrollTop();