Merge remote-tracking branch 'origin/master' into nightly

docs/_ext/tutordocs.py

@@ -2,6 +2,7 @@
 This module is heavily inspired by Django's djangodocs.py:
 https://github.com/django/django/blob/main/docs/_ext/djangodocs.py
 """
+
 from sphinx.application import Sphinx
 
 

requirements/base.txt

@@ -18,13 +18,13 @@ click==8.1.7
     # via -r requirements/base.in
 google-auth==2.23.3
     # via kubernetes
-idna==3.4
+idna==3.7
     # via requests
 importlib-metadata==7.0.1
     # via -r requirements/base.in
 importlib-resources==6.1.1
     # via -r requirements/base.in
-jinja2==3.1.3
+jinja2==3.1.4
     # via -r requirements/base.in
 kubernetes==28.1.0
     # via -r requirements/base.in
@@ -52,7 +52,7 @@ pyyaml==6.0.1
     # via
     #   -r requirements/base.in
     #   kubernetes
-requests==2.31.0
+requests==2.32.3
     # via
     #   kubernetes
     #   requests-oauthlib

requirements/dev.txt

@@ -12,7 +12,7 @@ astroid==3.0.1
     # via pylint
 attrs==23.1.0
     # via scriv
-black==23.10.1
+black==24.4.2
     # via -r requirements/dev.in
 build==1.0.3
     # via pip-tools
@@ -42,7 +42,7 @@ click-log==0.4.0
     # via scriv
 coverage==7.3.2
     # via -r requirements/dev.in
-cryptography==42.0.3
+cryptography==42.0.8
     # via secretstorage
 dill==0.3.7
     # via pylint
@@ -54,7 +54,7 @@ google-auth==2.23.3
     # via
     #   -r requirements/base.txt
     #   kubernetes
-idna==3.4
+idna==3.7
     # via
     #   -r requirements/base.txt
     #   requests
@@ -77,7 +77,7 @@ jeepney==0.8.0
     # via
     #   keyring
     #   secretstorage
-jinja2==3.1.3
+jinja2==3.1.4
     # via
     #   -r requirements/base.txt
     #   scriv
@@ -163,7 +163,7 @@ pyyaml==6.0.1
     #   kubernetes
 readme-renderer==42.0
     # via twine
-requests==2.31.0
+requests==2.32.3
     # via
     #   -r requirements/base.txt
     #   kubernetes

requirements/docs.txt

@@ -36,7 +36,7 @@ google-auth==2.23.3
     # via
     #   -r requirements/base.txt
     #   kubernetes
-idna==3.4
+idna==3.7
     # via
     #   -r requirements/base.txt
     #   requests
@@ -48,7 +48,7 @@ importlib-metadata==7.0.1
     #   sphinx
 importlib-resources==6.1.1
     # via -r requirements/base.txt
-jinja2==3.1.3
+jinja2==3.1.4
     # via
     #   -r requirements/base.txt
     #   sphinx
@@ -94,7 +94,7 @@ pyyaml==6.0.1
     # via
     #   -r requirements/base.txt
     #   kubernetes
-requests==2.31.0
+requests==2.32.3
     # via
     #   -r requirements/base.txt
     #   kubernetes

tutor/commands/jobs.py

@@ -1,6 +1,7 @@
 """
 Common jobs that must be added both to local, dev and k8s commands.
 """
+
 from __future__ import annotations
 
 import functools

tutor/env.py

@@ -6,8 +6,8 @@ import shutil
 import typing as t
 from copy import deepcopy
 
-import jinja2
 import importlib_resources
+import jinja2
 
 from tutor import exceptions, fmt, hooks, plugins, utils
 from tutor.__about__ import __app__, __version__

tutor/hooks/__init__.py

@@ -1,8 +1,8 @@
 # The Tutor plugin system is licensed under the terms of the Apache 2.0 license.
 __license__ = "Apache 2.0"
 
-import typing as t
 import functools
+import typing as t
 
 from typing_extensions import ParamSpec
 

tutor/hooks/catalog.py

@@ -2,6 +2,7 @@
 List of all the action, filter and context names used across Tutor. This module is used
 to generate part of the reference documentation.
 """
+
 from __future__ import annotations
 
 # The Tutor plugin system is licensed under the terms of the Apache 2.0 license.
@@ -197,9 +198,9 @@ class Filters:
     #:   added as subcommands to the ``local/dev/k8s do`` commands. They must return a list of
     #:   ("service name", "service command") tuples. Each "service command" will be executed
     #:   in the "service" container, both in local, dev and k8s mode.
-    CLI_DO_COMMANDS: Filter[
+    CLI_DO_COMMANDS: Filter[list[Callable[[Any], Iterable[tuple[str, str]]]], []] = (
-        list[Callable[[Any], Iterable[tuple[str, str]]]], []
+        Filter()
-    ] = Filter()
+    )
 
     #: List of initialization tasks (scripts) to be run in the ``init`` job. This job
     #: includes all database migrations, setting up, etc. To run some tasks before or

tutor/plugins/__init__.py

@@ -1,6 +1,7 @@
 """
 Provide API for plugin features.
 """
+
 from __future__ import annotations
 
 import functools