Skip to content

Commit

Permalink
Merge branch 'master' into all-config-with-env
Browse files Browse the repository at this point in the history
  • Loading branch information
aromanielloNTIA committed Oct 17, 2024
2 parents 82bc5ed + 0f44480 commit df2e1dc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ tox>=4.0,<5.0
# The following are sub-dependencies for which SCOS Sensor enforces a
# higher minimum patch version than the dependencies which require them.
# This is done to ensure the inclusion of specific security patches.
aiohttp>=3.9.4 # CVE-2024-30251, CVE-2024-27306
aiohttp>=3.10.2 # CVE-2024-42367
12 changes: 6 additions & 6 deletions src/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
#
# pip-compile requirements-dev.in
#
aiohttp==3.9.4
aiohappyeyeballs==2.4.0
# via aiohttp
aiohttp==3.10.2
# via
# -r requirements-dev.in
# aiohttp-cors
Expand Down Expand Up @@ -59,10 +61,8 @@ colorama==0.4.6
colorful==0.5.5
# via ray
coverage[toml]==7.3.2
# via
# coverage
# pytest-cov
cryptography==42.0.4
# via pytest-cov
cryptography==43.0.1
# via -r requirements.txt
defusedxml==0.7.1
# via
Expand Down Expand Up @@ -126,7 +126,7 @@ idna==3.7
# -r requirements.txt
# requests
# yarl
importlib-resources==6.1.1
importlib-resources==6.4.5
# via
# -r requirements.txt
# jsonschema
Expand Down
2 changes: 1 addition & 1 deletion src/requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cryptography>=42.0.4
cryptography>=43.0.1
django>=3.2.25, <4.0
djangorestframework>=3.0, <4.0
django-session-timeout>=0.1, <1.0
Expand Down
4 changes: 2 additions & 2 deletions src/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ charset-normalizer==3.3.2
# via requests
click==8.1.7
# via ray
cryptography==42.0.4
cryptography==43.0.1
# via -r requirements.in
defusedxml==0.7.1
# via its-preselector
Expand Down Expand Up @@ -65,7 +65,7 @@ idna==3.7
# via
# -r requirements.in
# requests
importlib-resources==6.1.1
importlib-resources==6.4.5
# via
# jsonschema
# jsonschema-specifications
Expand Down

0 comments on commit df2e1dc

Please sign in to comment.