Merge branch 'master' into all-config-with-env

NTIA · Jan 3, 2025 · ce9b28f · ce9b28f
2 parents 1879b04 + 1ba2a7a
commit ce9b28f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -34,7 +34,7 @@ repos:
       - id: black
         types: [file, python]
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
         types: [file, markdown]
diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt
@@ -75,7 +75,7 @@ defusedxml==0.7.1
     #   its-preselector
 distlib==0.3.7
     # via virtualenv
-django==4.2.16
+django==4.2.17
     # via
     #   -r requirements.txt
     #   django-session-timeout
@@ -139,8 +139,10 @@ its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0
     # via
     #   -r requirements.txt
     #   scos-actions
-jinja2==3.1.4
-    # via memray
+jinja2==3.1.5
+    # via
+    #   -r requirements.txt
+    #   memray
 jsonfield==3.1.0
     # via -r requirements.txt
 jsonschema==4.20.0
@@ -158,8 +160,10 @@ markdown-it-py[linkify,plugins]==3.0.0
     #   mdit-py-plugins
     #   rich
     #   textual
-markupsafe==2.1.5
-    # via jinja2
+markupsafe==3.0.2
+    # via
+    #   -r requirements.txt
+    #   jinja2
 marshmallow==3.20.1
     # via
     #   -r requirements.txt

diff --git a/src/requirements.in b/src/requirements.in
@@ -1,5 +1,5 @@
 cryptography>=43.0.1
-django>=4.2.16, <5.0
+django>=4.2.17, <5.0
 djangorestframework>=3.15.2, <4.0
 django-session-timeout>=0.1, <1.0
 drf-yasg>=1.0, <2.0
@@ -21,6 +21,7 @@ aiohttp>=3.10.11      # CVE-2024-52304
 certifi>=2024.7.4     # CVE-2024-39689
 idna>=3.7             # CVE-2024-3651
 grpcio>=1.53.0        # CVE-2023-32732, CVE-2023-32731, CVE-2023-1428
+jinja2>=3.1.5         # CVE-2024-56201, CVE-2024-56326
 pyyaml>=5.4.0         # CVE-2020-14343
 sqlparse>=0.5.0       # CVE-2024-4340
 urllib3>=2.2.2        # CVE-2024-37891

diff --git a/src/requirements.txt b/src/requirements.txt
@@ -35,7 +35,7 @@ cryptography==43.0.1
     # via -r requirements.in
 defusedxml==0.7.1
     # via its-preselector
-django==4.2.16
+django==4.2.17
     # via
     #   -r requirements.in
     #   django-session-timeout
@@ -78,12 +78,16 @@ inflection==0.5.1
     # via drf-yasg
 its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0
     # via scos-actions
+jinja2==3.1.5
+    # via -r requirements.in
 jsonfield==3.1.0
     # via -r requirements.in
 jsonschema==4.20.0
     # via ray
 jsonschema-specifications==2023.11.2
     # via jsonschema
+markupsafe==3.0.2
+    # via jinja2
 marshmallow==3.20.1
     # via environs
 msgpack==1.0.7