Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/NTIA/scos-sensor into wai…
Browse files Browse the repository at this point in the history
…t_until_db_ready
  • Loading branch information
jhazentia committed Jan 2, 2024
2 parents 4d4b7f6 + fb2aa21 commit 35ef89d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 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.8.5 # CVE-2023-37276
aiohttp>=3.9.0 # CVE-2023-37276
17 changes: 9 additions & 8 deletions src/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile requirements-dev.in
#
aiohttp==3.8.5
aiohttp==3.9.0
# via
# -r requirements-dev.in
# aiohttp-cors
Expand Down Expand Up @@ -49,7 +49,6 @@ chardet==5.1.0
charset-normalizer==3.0.1
# via
# -r requirements.txt
# aiohttp
# requests
click==8.1.3
# via
Expand All @@ -69,16 +68,18 @@ coreschema==0.0.4
# coreapi
# drf-yasg
coverage[toml]==7.2.1
# via pytest-cov
cryptography==41.0.4
# via
# coverage
# pytest-cov
cryptography==41.0.6
# via -r requirements.txt
defusedxml==0.7.1
# via
# -r requirements.txt
# its-preselector
distlib==0.3.6
# via virtualenv
django==3.2.20
django==3.2.23
# via
# -r requirements.txt
# django-session-timeout
Expand Down Expand Up @@ -140,7 +141,7 @@ inflection==0.5.1
# drf-yasg
iniconfig==2.0.0
# via pytest
its-preselector @ git+https://github.com/NTIA/Preselector@3.0.2
its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0
# via
# -r requirements.txt
# scos-actions
Expand Down Expand Up @@ -319,11 +320,11 @@ scipy==1.10.1
# via
# -r requirements.txt
# scos-actions
scos-actions @ git+https://github.com/NTIA/scos-actions@6.4.2
scos-actions @ git+https://github.com/NTIA/scos-actions@7.0.0
# via
# -r requirements.txt
# scos-tekrsa
scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.1.5
scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@4.0.0
# via -r requirements.txt
sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive
# via
Expand Down
6 changes: 3 additions & 3 deletions src/requirements.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cryptography>=41.0.4
django>=3.2.20, <4.0
cryptography>=41.0.6
django>=3.2.23, <4.0
djangorestframework>=3.0, <4.0
django-session-timeout>=0.1, <1.0
drf-yasg>=1.0, <2.0
Expand All @@ -13,7 +13,7 @@ psycopg2-binary>=2.0, <3.0
pyjwt>=2.4.0, <3.0
requests-mock>=1.0, <2.0
requests_oauthlib>=1.0, <2.0
scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.1.5
scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@4.0.0

# The following are sub-dependencies for which SCOS Sensor enforces a
# higher minimum patch version than the dependencies which require them.
Expand Down
10 changes: 5 additions & 5 deletions src/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ coreschema==0.0.4
# via
# coreapi
# drf-yasg
cryptography==41.0.4
cryptography==41.0.6
# via -r requirements.in
defusedxml==0.7.1
# via its-preselector
django==3.2.20
django==3.2.23
# via
# -r requirements.in
# django-session-timeout
Expand Down Expand Up @@ -67,7 +67,7 @@ idna==3.4
# via requests
inflection==0.5.1
# via drf-yasg
its-preselector @ git+https://github.com/NTIA/Preselector@3.0.2
its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0
# via scos-actions
itypes==1.2.0
# via coreapi
Expand Down Expand Up @@ -151,9 +151,9 @@ ruamel-yaml-clib==0.2.8
# via ruamel-yaml
scipy==1.10.1
# via scos-actions
scos-actions @ git+https://github.com/NTIA/scos-actions@6.4.2
scos-actions @ git+https://github.com/NTIA/scos-actions@7.0.0
# via scos-tekrsa
scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.1.5
scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@4.0.0
# via -r requirements.in
sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive
# via scos-actions
Expand Down

0 comments on commit 35ef89d

Please sign in to comment.