Update dependency ruff to v0.3.6

Dockerfile

@@ -15,7 +15,7 @@ FROM python:3.12-slim as production
 
 ENV VIRTUAL_ENV=/venv
 
-# renovate: datasource=github-tags depName=gchq/cyberchef
+# renovate: datasource=github-tags depName=just-containers/s6-overlay
 ENV S6_OVERLAY_VERSION=3.1.6.2
 
 RUN useradd website --create-home -u 1000 && mkdir /app $VIRTUAL_ENV && chown -R website /app $VIRTUAL_ENV

dev-requirements.txt

@@ -10,5 +10,5 @@ wagtail-factories==4.1.0
 coverage==7.4.0
 djlint==1.34.1
 types-pyyaml
-ruff==0.3.5
+ruff==0.3.6
 setuptools  # required for Honcho to work on Python 3.12+

justfile

@@ -52,5 +52,9 @@ lint_python:
   docker-compose -f {{ DEV_COMPOSE }} up -d
   docker-compose -f {{ DEV_COMPOSE }} exec web bash
 
+@sh-root:
+  docker-compose -f {{ DEV_COMPOSE }} up -d
+  docker-compose -f {{ DEV_COMPOSE }} exec --user=root web bash
+
 @down:
   docker-compose -f {{ DEV_COMPOSE }} down

package-lock.json

@@ -14,7 +14,7 @@
         "bulma": "0.9.4",
         "elevator.js": "1.0.1",
         "esbuild": "0.19.2",
-        "glightbox": "3.2.0",
+        "glightbox": "3.3.0",
         "htmx.org": "1.9.2",
         "lite-youtube-embed": "0.3.0",
         "lodash.clamp": "4.0.3",
@@ -1705,9 +1705,9 @@
       }
     },
     "node_modules/glightbox": {
-      "version": "3.2.0",
+      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.3.0.tgz",
-      "integrity": "sha512-iit1xYixqL4YVL+I2YJLfMeyJwvLi6FE6kY3qNKeZHEJgRIz80QU8Rm7YCyw1wOTgXvmNDnXGVhHOHRCwnDltQ=="
+      "integrity": "sha512-SJukatHBZZ/POMOpLUQ6/dhXf/wJTDx1wZ/FwApjseXw2WrRj3Ze9DzNCFYzca0oU7RjXQhi9o02aIZ9SuCz1A=="
     },
     "node_modules/glob": {
       "version": "7.2.3",
@@ -5151,9 +5151,9 @@
       }
     },
     "glightbox": {
-      "version": "3.2.0",
+      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.3.0.tgz",
-      "integrity": "sha512-iit1xYixqL4YVL+I2YJLfMeyJwvLi6FE6kY3qNKeZHEJgRIz80QU8Rm7YCyw1wOTgXvmNDnXGVhHOHRCwnDltQ=="
+      "integrity": "sha512-SJukatHBZZ/POMOpLUQ6/dhXf/wJTDx1wZ/FwApjseXw2WrRj3Ze9DzNCFYzca0oU7RjXQhi9o02aIZ9SuCz1A=="
     },
     "glob": {
       "version": "7.2.3",

package.json

@@ -34,7 +34,7 @@
     "bulma": "0.9.4",
     "elevator.js": "1.0.1",
     "esbuild": "0.19.2",
-    "glightbox": "3.2.0",
+    "glightbox": "3.3.0",
     "htmx.org": "1.9.2",
     "lite-youtube-embed": "0.3.0",
     "lodash.clamp": "4.0.3",

requirements.txt

@@ -10,7 +10,7 @@ wagtail-generic-chooser==0.6
 django-rq==2.10.1
 django-redis==5.4.0
 gunicorn==21.2.0
-psycopg2==2.9.9
+psycopg==3.1.18
 djangorestframework
 django-htmx==1.17.2
 wagtail-metadata==5.0.0

static/src/scss/_content.scss

@@ -56,6 +56,9 @@ section.content {
 .gslide-image img {
   object-fit: contain !important;
 
+  // Manually set sizes, as mermaid images are very small
+  width: 80vw !important;
+
   &[src*="mermaid.ink"] {
     @include dark-mode {
       filter: invert(100%);

website/common/templates/common/blocks/image-caption.html

@@ -2,7 +2,7 @@
 
 <figure>
   <div class="image">
-    <a href="{% image_url value.image 'original' %}" class="glightbox" data-gallery="content" data-height="70vh" data-width="95vw" data-alt="{{ value.caption|richtext|extract_text }}">
+    <a href="{% image_url value.image 'original' %}" class="glightbox" data-gallery="content" data-height="70vh" data-alt="{{ value.caption|richtext|extract_text }}" data-title="{{ value.caption|richtext|extract_text }}">
       <img src="{% image_url value.image 'width-1500' %}" alt="{{ value.caption|richtext|extract_text }}" loading="lazy" decoding="async" />
     </a>
   </div>

website/contrib/mermaid_block/templates/contrib/blocks/mermaid.html

@@ -2,7 +2,7 @@
 
 <figure>
   <div class="image">
-    <a href="https://mermaid.ink/svg/{{ value.pako }}" data-gallery="content" class="glightbox" data-type="image" data-height="60vh" data-width="95vw" data-alt="{{ value.caption|richtext|extract_text }}">
+    <a href="https://mermaid.ink/svg/{{ value.pako }}" data-gallery="content" class="glightbox" data-type="image" data-height="70vh" data-alt="{{ value.caption|richtext|extract_text }}" data-title="{{ value.caption|richtext|extract_text }}">
       <img src="https://mermaid.ink/svg/{{ value.pako }}" referrerpolicy="no-referrer" alt="{{ value.caption|richtext|extract_text }}" loading="lazy" decoding="async" />
     </a>
   </div>

website/settings.py

@@ -375,6 +375,11 @@ LOGGING = {
             "level": "WARNING",
             "propagate": False,
         },
+        "wagtail.images": {
+            "handlers": ["console"],
+            "level": "DEBUG",
+            "propagate": False,
+        },
         "django.request": {
             "handlers": ["console"],
             "level": "ERROR",