ci: merge main to release (ietf-tools#9398)

Author: rjsparks

.github/workflows/build-base-app.yml

@@ -43,7 +43,7 @@ jobs:
     - name: Docker Build & Push
       uses: docker/build-push-action@v6
       env:
-        DOCKER_BUILD_NO_SUMMARY: true
+        DOCKER_BUILD_SUMMARY: false
       with:
         context: .
         file: docker/base.Dockerfile

.github/workflows/build-devblobstore.yml

@@ -35,7 +35,7 @@ jobs:
     - name: Docker Build & Push
       uses: docker/build-push-action@v6
       env:
-        DOCKER_BUILD_NO_SUMMARY: true
+        DOCKER_BUILD_SUMMARY: false
       with:
         context: .
         file: docker/devblobstore.Dockerfile

.github/workflows/build-mq-broker.yml

@@ -42,7 +42,7 @@ jobs:
     - name: Docker Build & Push
       uses: docker/build-push-action@v6
       env:
-        DOCKER_BUILD_NO_SUMMARY: true
+        DOCKER_BUILD_SUMMARY: false
       with:
         context: .
         file: dev/mq/Dockerfile

.github/workflows/dev-assets-sync-nightly.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Docker Build & Push
         uses: docker/build-push-action@v6
         env:
-          DOCKER_BUILD_NO_SUMMARY: true
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: .
           file: dev/shared-assets-sync/Dockerfile

dev/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/ietf-tools/datatracker-app-base:20250807T1514
+FROM ghcr.io/ietf-tools/datatracker-app-base:20250821T1359
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
 ENV DEBIAN_FRONTEND=noninteractive

dev/build/TARGET_BASE

@@ -1 +1 @@
-20250807T1514
+20250821T1359

dev/deploy-to-container/start.sh

@@ -35,6 +35,18 @@ echo "Running Datatracker checks..."
 
 # Migrate, adjusting to what the current state of the underlying database might be:
 
+# On production, the blobdb tables are in a separate database. Manipulate migration
+# history to ensure that they're created for the sandbox environment that runs it
+# all from a single database.
+echo "Ensuring blobdb relations exist..."
+/usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local --fake blobdb zero
+if ! /usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local blobdb; then
+  # If we are restarting a sandbox, the migration may already have run and re-running
+  # it will fail. Assume that happened and fake it.
+  /usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local --fake blobdb
+fi
+
+# Now run the migrations for real
 echo "Running Datatracker migrations..."
 /usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local
 

docker/base.Dockerfile

@@ -69,7 +69,7 @@ RUN apt-get update --fix-missing && apt-get install -qy --no-install-recommends
 	nodejs \
 	pgloader \
 	pigz \
-	postgresql-client-14 \
+	postgresql-client-17 \
 	pv \
 	python3-ipython \
 	ripgrep \

docker/db.Dockerfile

@@ -1,7 +1,7 @@
 # =====================
 # --- Builder Stage ---
 # =====================
-FROM postgres:16 AS builder
+FROM postgres:17 AS builder
 
 ENV POSTGRES_PASSWORD=hk2j22sfiv
 ENV POSTGRES_USER=django
@@ -19,7 +19,7 @@ RUN ["/usr/local/bin/docker-entrypoint.sh", "postgres"]
 # ===================
 # --- Final Image ---
 # ===================
-FROM postgres:16
+FROM postgres:17
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
 COPY --from=builder /data $PGDATA

ietf/api/__init__.py

@@ -4,6 +4,7 @@
 
 import datetime
 import re
+import sys
 
 from urllib.parse import urlencode
 
@@ -25,6 +26,9 @@
 
 OMITTED_APPS_APIS = ["ietf.status"]
 
+# Pre-py3.11, fromisoformat() does not handle Z or +HH tz offsets
+HAVE_BROKEN_FROMISOFORMAT = sys.version_info < (3, 11, 0, "", 0)
+
 def populate_api_list():
     _module_dict = globals()
     for app_config in django_apps.get_app_configs():
@@ -58,6 +62,35 @@ def generate_cache_key(self, *args, **kwargs):
         # Use a list plus a ``.join()`` because it's faster than concatenation.
         return "%s:%s:%s:%s" % (self._meta.api_name, self._meta.resource_name, ':'.join(args), smooshed)
 
+    def _z_aware_fromisoformat(self, value):
+        """datetime.datetie.fromisoformat replacement that works with python < 3.11"""
+        if HAVE_BROKEN_FROMISOFORMAT:
+            if value.upper().endswith("Z"):
+                value = value[:-1] + "+00:00"  # Z -> UTC
+            elif re.match(r"[+-][0-9][0-9]$", value[-3:]):
+                value = value + ":00"  # -04 -> -04:00
+        return value
+
+    def filter_value_to_python(
+        self, value, field_name, filters, filter_expr, filter_type
+    ):
+        py_value = super().filter_value_to_python(
+            value, field_name, filters, filter_expr, filter_type
+        )
+        if isinstance(
+            self.fields[field_name], tastypie.fields.DateTimeField
+        ) and isinstance(py_value, str):
+            # Ensure datetime values are TZ-aware, using UTC by default
+            try:
+                dt = self._z_aware_fromisoformat(py_value)
+            except ValueError:
+                pass  # let tastypie deal with the original value
+            else:
+                if dt.tzinfo is None:
+                    dt = dt.replace(tzinfo=datetime.timezone.utc)
+                py_value = dt.isoformat()
+        return py_value
+
 
 TIMEDELTA_REGEX = re.compile(r'^(?P<days>\d+d)?\s?(?P<hours>\d+h)?\s?(?P<minutes>\d+m)?\s?(?P<seconds>\d+s?)$')