Update All The Things October 2024

.github/workflows/ci.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v3
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
@@ -61,7 +61,7 @@ jobs:
       ALLOWED_HOSTS: localhost
     services:
       postgres:
-        image: postgres:13
+        image: postgres:16
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgress
@@ -70,13 +70,13 @@ jobs:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Poetry
         run: pipx install poetry==1.8.3 # Make sure this matches POETRY_VERSION in the Dockerfile
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           cache: 'poetry'
       - name: Install Python dependencies
         run: poetry install

.pre-commit-config.yaml

@@ -1,28 +1,28 @@
 default_language_version:
   node: 20.15.0
-  python: python3.11
+  python: python3.12
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 24.10.0
     hooks:
       - id: black
         language_version: python3
         args: ['--target-version', 'py311']
   - repo: https://github.com/pycqa/isort
     # isort config is in setup.cfg
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         name: isort (python)
   - repo: https://github.com/pycqa/flake8
     # flake8 config is in setup.cfg
-    rev: 6.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-assertive==2.1.0
           - flake8-blind-except==0.2.1
-          - flake8-comprehensions==3.10.1
+          - flake8-comprehensions==3.15.0
   - repo: https://github.com/pycontribs/mirrors-prettier
     rev: v3.3.2
     hooks:
@@ -48,6 +48,6 @@ repos:
           - [email protected]
           - '@wagtail/[email protected]'
   - repo: https://github.com/rtts/djhtml
-    rev: 3.0.4
+    rev: 3.0.7
     hooks:
       - id: djhtml

Dockerfile

@@ -11,7 +11,7 @@ RUN npm run build:prod
 
 
 # Build Python app - this stage is a common base for the prod and dev stages
-FROM python:3.11-bullseye AS backend
+FROM python:3.12-bookworm AS backend
 
 ARG POETRY_VERSION=1.8.3
 ARG UID=1000
@@ -27,7 +27,7 @@ ENV DJANGO_SETTINGS_MODULE=wagtailio.settings.production \
 
 # Install operating system dependencies.
 RUN apt-get update --yes --quiet && \
-    apt-get install -y apt-transport-https rsync libmagickwand-dev unzip postgresql-client-13 \
+    apt-get install -y apt-transport-https rsync libmagickwand-dev unzip postgresql-client-15 \
     jpegoptim pngquant gifsicle libjpeg-progs webp && \
     rm -rf /var/lib/apt/lists/*
 
@@ -46,7 +46,7 @@ RUN chown --recursive $UID:$GID /app /venv
 
 
 # This stage builds the image that will run in production
-FROM backend AS prod
+FROM backend as prod
 
 # Switch to application user
 USER wagtailio

docker-compose.yml

@@ -27,7 +27,7 @@ services:
         condition: service_healthy
 
   db:
-    image: postgres:13
+    image: postgres:16
     expose:
       - 5432
     environment:

pyproject.toml

@@ -12,36 +12,36 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = "^3.12"
 django = "~5.0.6"
-wagtail = "~6.1.2"
-psycopg2 = "~2.9"
-gunicorn = "~21.2.0"
-dj-database-url = "~2.1.0"
+wagtail = "~6.2.2"
+psycopg = "~3.2"
+gunicorn = "~23.0.0"
+dj-database-url = "~2.3.0"
 django-basic-auth-ip-whitelist = "~0.6"
-django-csp = "~3.7"
+django-csp = "~3.8"
 django-manifest-loader = "~1.0.0"
 django-pattern-library = "~1.2.0"
-django-permissions-policy = "~4.18"
+django-permissions-policy = "~4.22"
 django-referrer-policy = "~1.0"
-django-storages = { version ="~1.13", extras = ["boto3"] }
-markdown = "~3.5"
-pygments = "~2.17"
-requests = "~2.28.1"
-scout-apm = "~3.0"
-sentry-sdk = "~1.38"
+django-storages = { version ="~1.14", extras = ["s3"] }
+markdown = "~3.7"
+pygments = "~2.18"
+requests = "~2.32.3"
+scout-apm = "~3.2"
+sentry-sdk = "~2.17"
 wagtail-font-awesome-svg = "~1.0.1"
 
 wagtailmedia = "~0.15.2"
-whitenoise = "~6.6"
+whitenoise = "~6.7"
 django-redis = "~5.4"
 
 [tool.poetry.group.dev.dependencies]
-black = "23.1.0"
-djhtml = "3.0.4"
-flake8 = "6.0.0"
+black = "24.10.0"
+djhtml = "3.0.7"
+flake8 = "7.1.1"
 flake8-assertive = "2.1.0"
 flake8-blind-except = "0.2.1"
-flake8-comprehensions = "3.10.1"
-isort = "5.12.0"
-pre-commit = "2.20.0"
+flake8-comprehensions = "3.15.0"
+isort = "5.13.2"
+pre-commit = "4.0.1"

vagrant/provision.sh

@@ -15,7 +15,7 @@ apt-get install -y unzip
 export DEBIAN_FRONTEND=noninteractive
 apt-get remove -y --purge postgresql*
 apt-get update -y
-apt-get install -y postgresql-13 postgresql-client-13 postgresql-contrib-13 libpq-dev
+apt-get install -y postgresql-16 postgresql-client-16 postgresql-contrib-16 libpq-dev
 su - postgres -c "createuser -s vagrant"
 
 # Create database

wagtailio/core/blocks.py

@@ -328,9 +328,9 @@ def clean(self, value):
                     )
                 ]
             )
-            errors["image_for_external_link"] = errors[
-                "heading_for_external_link"
-            ] = errors["subheading_for_ext_link"] = error
+            errors["image_for_external_link"] = errors["heading_for_external_link"] = (
+                errors["subheading_for_ext_link"]
+            ) = error
 
         if errors:
             raise StructBlockValidationError(errors)

wagtailio/core/wagtail_hooks.py

@@ -7,7 +7,7 @@
 from wagtail.documents.models import document_served
 from wagtail.whitelist import allow_without_attributes
 
-from storages.backends.s3boto3 import S3Boto3Storage
+from storages.backends.s3 import S3Storage
 
 
 @hooks.register("construct_whitelister_element_rules")
@@ -48,7 +48,7 @@ def serve_document_from_s3(document, request):
     and potentially risking DoS attack and the server timing out.
     """
     # Skip this hook if not using django-storages boto3 backend.
-    if not issubclass(get_storage_class(), S3Boto3Storage):
+    if not issubclass(get_storage_class(), S3Storage):
         return
 
     # Send document_served signal, same as Wagtail does.

wagtailio/roadmap/forms.py

@@ -9,7 +9,9 @@ class ImportForm(forms.Form):
         max_length=64,
         required=requires_token,
         label="GitHub access token",
-        help_text="Optional — if not supplied, a default token will be used"
-        if not requires_token
-        else None,
+        help_text=(
+            "Optional — if not supplied, a default token will be used"
+            if not requires_token
+            else None
+        ),
     )

wagtailio/roadmap/models.py

@@ -74,7 +74,6 @@ def get_context(self, request, *args, **kwargs):
 class MilestoneItem(Orderable):
     NEEDS_SPONSORSHIP_LABEL = "needs sponsorship"
 
-    needs_sponsorship = models.BooleanField(default=False, editable=False)
     sponsorship_url = models.URLField(
         blank=True,
         verbose_name="Sponsorship URL",

wagtailio/settings/base.py

@@ -7,6 +7,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.2/ref/settings/
 """
+
 import os
 import sys
 from os.path import abspath, dirname, join
@@ -185,7 +186,7 @@
 # S3 configuration
 
 if "AWS_STORAGE_BUCKET_NAME" in env:
-    STORAGES["default"]["BACKEND"] = "storages.backends.s3boto3.S3Boto3Storage"
+    STORAGES["default"]["BACKEND"] = "storages.backends.s3.S3Storage"
     AWS_STORAGE_BUCKET_NAME = env["AWS_STORAGE_BUCKET_NAME"]
     AWS_S3_FILE_OVERWRITE = False
 

wagtailio/wsgi.py

@@ -6,6 +6,7 @@
 For more information on this file, see
 https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
 """
+
 from django.core.wsgi import get_wsgi_application
 
 application = get_wsgi_application()