Update dependency ruff to v0.3.6

Add description to image lightbox
Update dependency glightbox to v3.3.0
2024-04-11 18:00:32 +01:00 · 2024-04-07 20:05:31 +01:00 · 2024-04-07 16:12:33 +01:00 · 2024-04-07 15:52:40 +01:00 · 2024-04-07 15:52:33 +01:00 · 2024-04-07 15:38:01 +01:00
10 changed files with 25 additions and 13 deletions
--- a/2
+++ b/2
@ -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
--- a/dev-requirements.txt
+++ b/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+
--- a/4
+++ b/4
@ -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
--- a/package-lock.json
+++ b/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",
-      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.2.0.tgz",
-      "integrity": "sha512-iit1xYixqL4YVL+I2YJLfMeyJwvLi6FE6kY3qNKeZHEJgRIz80QU8Rm7YCyw1wOTgXvmNDnXGVhHOHRCwnDltQ=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.3.0.tgz",
+      "integrity": "sha512-SJukatHBZZ/POMOpLUQ6/dhXf/wJTDx1wZ/FwApjseXw2WrRj3Ze9DzNCFYzca0oU7RjXQhi9o02aIZ9SuCz1A=="
    },
    "node_modules/glob": {
      "version": "7.2.3",
@ -5151,9 +5151,9 @@
      }
    },
    "glightbox": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.2.0.tgz",
-      "integrity": "sha512-iit1xYixqL4YVL+I2YJLfMeyJwvLi6FE6kY3qNKeZHEJgRIz80QU8Rm7YCyw1wOTgXvmNDnXGVhHOHRCwnDltQ=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/glightbox/-/glightbox-3.3.0.tgz",
+      "integrity": "sha512-SJukatHBZZ/POMOpLUQ6/dhXf/wJTDx1wZ/FwApjseXw2WrRj3Ze9DzNCFYzca0oU7RjXQhi9o02aIZ9SuCz1A=="
    },
    "glob": {
      "version": "7.2.3",
--- a/package.json
+++ b/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",
--- a/requirements.txt
+++ b/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
--- a/static/src/scss/_content.scss
+++ b/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%);
--- a/website/common/templates/common/blocks/image-caption.html
+++ b/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>
--- a/website/contrib/mermaid_block/templates/contrib/blocks/mermaid.html
+++ b/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>
--- a/website/settings.py
+++ b/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",
Author	SHA1	Message	Date
Renovate	4915886ed0	Update dependency ruff to v0.3.6	2024-04-11 18:00:32 +01:00
Jake Howard	a1808f4bb4	Add description to image lightbox	2024-04-07 20:05:31 +01:00
Renovate	f1934ecdaa	Update dependency glightbox to v3.3.0	2024-04-07 16:12:33 +01:00
Jake Howard	17969086a4	Add alias for root shell	2024-04-07 15:52:40 +01:00
Jake Howard	f83c38c2f1	Add logging for image rendition generation	2024-04-07 15:52:33 +01:00
Jake Howard	90b18c7d72	Fix comment for S6 updates	2024-04-07 15:38:01 +01:00
Jake Howard	506e554230	Upgrade to Psycopg3	2024-04-07 15:28:40 +01:00