Merge branch 'release' into 'master'

Release 82.9

See merge request buckinghamshire-council/bc!808

.gitlab-ci.yml

@@ -30,7 +30,7 @@ stages:
     policy: pull
 
 .node:
-  image: node:14-alpine
+  image: node:20-alpine
   extends: .cache_static
   needs:
     - static
@@ -55,7 +55,7 @@ poetry:
   image: python:3.11-bullseye
   stage: build
   variables:
-    POETRY_VERSION: 1.8.4
+    POETRY_VERSION: 1.8.5
   script:
     - pip install poetry==$POETRY_VERSION
     - python -m venv venv

.nvmrc

@@ -1 +1 @@
-14
+20

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
       - id: django-upgrade
         args: [--target-version, '4.2'] # Replace with Django version
   - repo: https://github.com/python-poetry/poetry
-    rev: '1.8.4' # keep version in sync with version installed in the Dockerfile
+    rev: '1.8.5' # keep version in sync with version installed in the Dockerfile
     hooks:
       - id: poetry-check
       - id: poetry-lock

.travis.yml

@@ -37,7 +37,7 @@ install:
   - pip install flake8
 
   # Install node
-  - nvm install 12
+  - nvm install 20
 
   # Install node dependencies
   - npm ci --no-optional --no-audit --progress=false

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release History
 
+## 82.9 (2025-01-08)
+
+Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/82.8...82.9>
+
+- Upgrade to Wagtail 6.3
+- Upgrade node version from v12 to v20
+
 ## 82.8 (2025-01-08)
 
 Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/82.7...82.8>

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-alpine AS frontend
+FROM node:20-alpine as frontend
 
 # Make build & post-install scripts behave as if we were in a CI environment (e.g. for logging verbosity purposes).
 ARG CI=true
@@ -24,7 +24,7 @@ FROM python:3.11-slim AS backend
 ARG POETRY_INSTALL_ARGS="--without=dev"
 
 # IMPORTANT: Remember to review both of these when upgrading
-ARG POETRY_VERSION=1.8.4
+ARG POETRY_VERSION=1.8.5
 
 # Install dependencies in a virtualenv
 ENV VIRTUAL_ENV=/venv

bc/documents/migrations/0005_alter_customdocument_file_size.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.18 on 2025-01-17 16:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("documents", "0004_job_attachments"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="customdocument",
+            name="file_size",
+            field=models.PositiveBigIntegerField(editable=False, null=True),
+        ),
+    ]

bc/images/migrations/0007_customimage_description.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.18 on 2025-01-17 16:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("images", "0006_django_42_upgrade"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="customimage",
+            name="description",
+            field=models.CharField(
+                blank=True, default="", max_length=255, verbose_name="description"
+            ),
+        ),
+    ]

bc/utils/views.py

@@ -2,7 +2,7 @@
 from django.views import defaults
 
 from wagtail.admin.auth import permission_denied
-from wagtail.admin.views.pages.listing import ExplorablePageFilterSet
+from wagtail.admin.views.pages.listing import GenericPageFilterSet
 from wagtail.admin.views.reports import PageReportView
 from wagtail.models import Page
 
@@ -26,7 +26,7 @@ class UnpublishedChangesReportView(PageReportView):
     page_title = "Pages with unpublished changes"
     index_url_name = "unpublished_changes_report"
     index_results_url_name = "unpublished_changes_report_results"
-    filterset_class = ExplorablePageFilterSet
+    filterset_class = GenericPageFilterSet
 
     list_export = PageReportView.list_export + ["last_published_at"]
     export_headings = dict(
@@ -51,7 +51,7 @@ class MissingMetadataReportView(PageReportView):
     page_title = "Pages missing SEO metadata"
     index_url_name = "missing_metadata_report"
     index_results_url_name = "missing_metadata_report_results"
-    filterset_class = ExplorablePageFilterSet
+    filterset_class = GenericPageFilterSet
 
     list_export = PageReportView.list_export + ["seo_title", "search_description"]
     export_headings = dict(

docs/upgrading.md

@@ -15,7 +15,7 @@ As much as possible, we want to use the official releases available on PyPI for
 
 ### Check these packages for updates
 
-**Last tested for wagtail 6.2 upgrade** Comments in the pyproject.toml file may have more detailed information.
+**Last tested for wagtail 6.3 upgrade** Comments in the pyproject.toml file may have more detailed information.
 
 - wagtail-django-recaptcha