Merge pull request #323 from lsst-sqre/tickets/DM-42335

DM-42335: Update dependencies
lsst-sqre · Jan 2, 2024 · 8677f3c · 8677f3c
2 parents 7374c87 + 187035f
commit 8677f3c
Show file tree

Hide file tree

Showing 10 changed files with 1,193 additions and 1,162 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.9
+    rev: v0.1.10
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

diff --git a/controller/requirements/dev.in b/controller/requirements/dev.in
@@ -25,5 +25,5 @@ types-pyyaml
 
 # Documentation
 autodoc_pydantic
-documenteer[guide]>=1.0.0a7
+documenteer[guide]>=1
 sphinx-diagrams
diff --git a/controller/requirements/dev.txt b/controller/requirements/dev.txt
diff --git a/controller/requirements/main.txt b/controller/requirements/main.txt
diff --git a/controller/src/controller/handlers/files.py b/controller/src/controller/handlers/files.py
@@ -75,9 +75,9 @@ async def route_user(
 
     # Construct and return the instructions page.
     return templates.TemplateResponse(
+        context.request,
         "fileserver.html.jinja",
         {
-            "request": context.request,
             "username": user.username,
             "base_url": config.base_url,
             "path_prefix": config.fileserver.path_prefix,

diff --git a/controller/src/controller/handlers/form.py b/controller/src/controller/handlers/form.py
@@ -55,9 +55,9 @@ async def get_user_lab_form(
 
     # Construct and return the spawner form.
     return templates.TemplateResponse(
+        context.request,
         "spawner.html.jinja",
         {
-            "request": context.request,
             "dropdown_sentinel": DROPDOWN_SENTINEL_VALUE,
             "cached_images": images.menu,
             "all_images": images.dropdown,

diff --git a/controller/src/controller/templates.py b/controller/src/controller/templates.py
@@ -9,15 +9,15 @@
 from datetime import timedelta
 
 from fastapi.templating import Jinja2Templates
-from jinja2 import PackageLoader
+from jinja2 import Environment, PackageLoader
 
 __all__ = ["templates"]
 
-# Starlette requires a directory argument, but since we override the loader so
-# that the templates are retrieved from the Python package, it's unused.
 templates = Jinja2Templates(
-    loader=PackageLoader("controller", package_path="templates"),
-    directory="templates",
+    env=Environment(
+        loader=PackageLoader("controller", package_path="templates"),
+        autoescape=True,
+    ),
 )
 """The template manager."""
 

diff --git a/hub/requirements/dev.txt b/hub/requirements/dev.txt
diff --git a/hub/requirements/main.txt b/hub/requirements/main.txt
diff --git a/inithome/requirements/dev.txt b/inithome/requirements/dev.txt