merge fix-ci into develop

Author: lukasjuhrich

.github/workflows/docker-image.yml

@@ -16,6 +16,7 @@ jobs:
         # as it stands this is wasteful.
         # assuming no PR has more than 50 commits.
         fetch-depth: 50
+        submodules: recursive
     - uses: actions/setup-python@v5
       with:
         python-version: '3.12'
@@ -44,13 +45,12 @@ jobs:
       - name: set up `uv`
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.6.2"
+          version: "0.8.18"
           enable-cache: true
           cache-dependency-glob: "uv.lock"
       - name: install pip dependencies with uv
         run: >
-          uv sync --locked --dev
-          && uv pip install deps/wtforms-widgets
+          uv sync --locked
           && uv pip list
         id: pip-install
       # now come the tests
@@ -95,6 +95,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - uses: oven-sh/setup-bun@v1
       with:
         bun-version: 1.1.26

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
   hooks:
     - id: ruff
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.6.2
+  rev: '0.8.18'
   hooks:
     - id: uv-lock
 - repo: https://github.com/semgrep/pre-commit

docker/prod.Dockerfile

@@ -10,9 +10,14 @@ WORKDIR /opt/pycroft/app
 # Download or build wheels of requirements
 COPY --chown=pycroft:pycroft uv.lock pyproject.toml ./
 COPY --chown=pycroft:pycroft ./deps ./deps
-RUN uv export --locked --no-emit-project --no-dev --group prod > requirements.prod.txt \
+RUN uv export \
+      --locked \
+      --no-emit-project \
+      --no-emit-package wtforms-widgets \
+      --no-dev \
+      --group prod \
+    > requirements.prod.txt \
   && /opt/pycroft/venv/bin/pip wheel --wheel-dir /opt/pycroft/wheel -r requirements.prod.txt \
-  && rm /opt/pycroft/wheel/wtforms_widgets*.whl \
   && /opt/pycroft/venv/bin/pip wheel --wheel-dir /opt/pycroft/wheel --no-deps ./deps/wtforms-widgets
 
 # Download JS/CSS dependencies

pycroft/model/ddl.py

@@ -52,7 +52,7 @@ def __init__(
         cascade: bool = False,
         **kw: t.Any,
     ):
-        super().__init__(element, cascade, **kw)
+        super().__init__(element, cascade=cascade, **kw)
         self.element = element
         self.if_exists = if_exists
         self.cascade = cascade

pyproject.toml

@@ -57,7 +57,7 @@ dependencies = [
     "schwifty ~= 2024.9.0",
     "sentry-sdk[Flask] ~= 1.29.2",
     "simplejson ~= 3.11.1",  # decimal serialization
-    "SQLAlchemy >= 2.0.1",
+    "SQLAlchemy >= 2.0.1, <= 2.0.37",
     "webargs ~= 8.3.0",
     "wrapt ~= 1.16.0",
     "WTForms ~= 2.3.3",