python 3.12, django 5.0, wagtail 6.1, postgres 12-16, psycopg 3

.github/report_nightly_build_failure.py

@@ -2,6 +2,7 @@
 Called by GitHub Actions when the nightly build fails.
 This reports an error to the #nightly-build-failures Slack channel.
 """
+
 import os
 import requests
 

.github/workflows/ci.yml

@@ -5,20 +5,23 @@ on:
     branches:
       - main
       - 'stable/**'
-
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   check-client:
     name: 🧑‍🚀 preflight (check client)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - id: npm-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('.nvmrc') }}-${{ hashFiles('**/package-lock.json') }}
@@ -30,120 +33,98 @@ jobs:
     name: ⚫ Black (check server)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Python black Lint
         uses: psf/black@stable
 
   check-server-flake8:
     name: 🎱 flake8 (check server)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Python flake8 Lint
-        uses: py-actions/flake8@v2.0.0
+        uses: py-actions/flake8@v2
 
   test-sqlite:
     runs-on: ubuntu-latest
     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'
+          - python: '3.8'
             django: '3.2'
-            python: '3.7'
-          - wagtail: '2.15'
+            wagtail: '3.0'
+          - python: '3.8'
             django: '3.2'
-            python: '3.8'
-          - wagtail: '2.15'
+            wagtail: '4.1'
+          - python: '3.10'
             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'
-
+            wagtail: '5.2'
+          - python: '3.12'
+            django: '5.0'
+            wagtail: '5.2'
+          - python: '3.12'
+            django: '5.0'
+            wagtail: '6.1'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - name: Install Tox
-        run: |
-          python -m pip install tox
+        run: pip install tox
       - name: Test
-        run: |
-          tox
+        run: tox
         env:
           TOXENV: python${{ matrix.python }}-django${{ matrix.django }}-wagtail${{ matrix.wagtail }}-sqlite
 
   test-postgres:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.8', '3.9', '3.10']
-        django: ['3.2', '4.0']
-        wagtail: ['2.16', '3.0', '4.0']
-        postgres: ['10.8']
         include:
-          - wagtail: '2.15'
+          - python: '3.8'
             django: '3.2'
-            postgres: '10.8'
-            python: '3.7'
-          - wagtail: '2.15'
+            wagtail: '3.0'
+            postgres: '12'
+          - python: '3.8'
             django: '3.2'
-            postgres: '10.8'
-            python: '3.8'
-          - wagtail: '2.15'
+            wagtail: '4.1'
+            postgres: '12'
+          - python: '3.10'
             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'
-
+            wagtail: '5.2'
+            postgres: '12'
+          - python: '3.12'
+            django: '5.0'
+            wagtail: '5.2'
+            postgres: '16'
+          - python: '3.12'
+            django: '5.0'
+            wagtail: '6.1'
+            postgres: '16'
     services:
       postgres:
         image: postgres:${{ matrix.postgres }}
         ports:
           - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - name: Install Tox
-        run: |
-          python -m pip install tox
+        run: pip install tox
       - name: Test
-        run: |
-          tox
+        run: tox
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/wagtail_hallo
           TOXENV: python${{ matrix.python }}-django${{ matrix.django }}-wagtail${{ matrix.wagtail }}-postgres

.github/workflows/nightly-tests.yml

@@ -15,21 +15,21 @@ jobs:
 
     services:
       postgres:
-        image: postgres:10.8
+        image: postgres:16
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install "psycopg2>=2.6"
+          pip install "psycopg>=3.1.8"
           pip install "git+https://github.com/wagtail/wagtail.git@main#egg=wagtail"
           pip install -e .[testing]
       - name: Test

.nvmrc

@@ -1 +1 @@
-16
+20

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - 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_
+- Add support for Python 3.12, Django 5.0, Wagtail 6.1 and Psycopg 3 by _Joren Hammudoglu_
 
 ## [0.1.0] - 2022-05-05
 

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 4.1
-- Wagtail 2.15, 2.16, 3.0, 4.0
+- Python 3.8, 3.9, 3.10, 3.11, 3.12
+- Django 3.2, 4.1, 4.2, 5.0
+- Wagtail 3.0, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0, 6.1
 
 ## Installing the Hallo Editor
 

package.json

@@ -44,7 +44,6 @@
       "$": "readonly",
       "addMessage": "readonly",
       "buildExpandingFormset": "readonly",
-      "cancelSpinner": "readonly",
       "escapeHtml": "readonly",
       "insertRichTextDeleteControl": "readonly",
       "jQuery": "readonly",

setup.py

@@ -30,25 +30,28 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "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",
         "Framework :: Django",
         "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4.0",
         "Framework :: Django :: 4.1",
+        "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
         "Framework :: Wagtail",
-        "Framework :: Wagtail :: 2",
         "Framework :: Wagtail :: 3",
         "Framework :: Wagtail :: 4",
+        "Framework :: Wagtail :: 5",
+        "Framework :: Wagtail :: 6",
     ],
     install_requires=[
-        "Django>=3.2,<4.2",
-        "Wagtail>=2.15,<4.1",
+        "Django>=3.2,<6.0",
+        "Wagtail>=3.0,<7.0",
     ],
     extras_require={
-        "testing": ["dj-database-url==0.5.0", "freezegun==0.3.15"],
+        "testing": ["html5lib==1.1"],
     },
     zip_safe=False,
 )

testmanage.py

@@ -56,7 +56,7 @@ def runtests():
     try:
         execute_from_command_line(argv)
     finally:
-        from wagtail.tests.settings import STATIC_ROOT, MEDIA_ROOT
+        from wagtail.test.settings import STATIC_ROOT, MEDIA_ROOT
 
         shutil.rmtree(STATIC_ROOT, ignore_errors=True)
         shutil.rmtree(MEDIA_ROOT, ignore_errors=True)

tox.ini

@@ -3,35 +3,36 @@ 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.8,3.9,3.10}-django3.2-wagtail3.0-{sqlite,postgres}
+    python{3.9,3.10,3.11}-django4.1-wagtail4.2-{sqlite,postgres}
+    python{3.10,3.11,3.12}-django{4.2,5.0}-wagtail{5.2,6.1}-{sqlite,postgres}
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
 commands = coverage run testmanage.py test --deprecation all
 
 basepython =
-    python3.7: python3.7
     python3.8: python3.8
     python3.9: python3.9
     python3.10: python3.10
+    python3.11: python3.11
+    python3.12: python3.12
 
 deps =
     coverage
 
-    django3.2: Django>=3.2,<3.3
-    django4.0: Django>=4.0,<4.1
-    django4.1: Django>=4.1,<4.2
+    django3.2: django>=3.2,<3.3
+    django4.2: django>=4.2,<5.0
+    django5.0: django>=5.0,<5.1
     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
+    wagtail5.2: wagtail>=5.2,<5.3
+    wagtail6.1: wagtail>=6.1,<6.2
     wagtailmain: git+https://github.com/wagtail/wagtail.git
 
-    postgres: psycopg2>=2.6
+    postgres: psycopg>=3.1.18
 
 setenv =
     postgres: DATABASE_URL={env:DATABASE_URL:postgres:///wagtail_hallo}

wagtail_hallo/static/css/hallo.css

@@ -201,13 +201,13 @@
   display: block;
 }
 
-/* 
+/*
   These styles correspond to the image formats defined in wagtailimages/formats.py,
   so that images displayed in the rich text field receive more or less the same
   styling that they would receive on the site front-end.
 
   Wagtail installations that define their own image formats (in a myApp.image_formats module)
-  should ideally use the insert_editor_css hook to pass in their own custom CSS to have those
+  should ideally use the insert_global_admin_css hook to pass in their own custom CSS to have those
   images render within the rich text area in the same styles that would appear on the front-end.
   close as possible to match line-height space above p
  */