From 11ed95a28f8f6c03fbc7a0bbc2f2f288ad9a788e Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Wed, 29 Nov 2023 12:40:05 -0700 Subject: [PATCH 1/4] switch preselector and scos-actions branches. --- src/requirements-dev.txt | 4 ++-- src/requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index fd5d6770..4ed6d234 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -142,7 +142,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@analog_inputs # via # -r requirements.txt # scos-actions @@ -321,7 +321,7 @@ 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@switch_diagnostics # via # -r requirements.txt # scos-tekrsa diff --git a/src/requirements.txt b/src/requirements.txt index abe173e0..12bb04ea 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -65,7 +65,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@analog_inputs # via scos-actions itypes==1.2.0 # via coreapi @@ -149,7 +149,7 @@ 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@switch_diagnostics # via scos-tekrsa scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.1.5 # via -r requirements.in From 4f5f15329a86dab743ee759244c922278fcb798d Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Wed, 29 Nov 2023 12:54:51 -0700 Subject: [PATCH 2/4] switch tekrsa branch. --- src/requirements-dev.txt | 2 +- src/requirements.in | 2 +- src/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index 4ed6d234..7aa09d82 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -325,7 +325,7 @@ scos-actions @ git+https://github.com/NTIA/scos-actions@switch_diagnostics # 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@switch_diagnostics # via -r requirements.txt sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via diff --git a/src/requirements.in b/src/requirements.in index b985812b..c794a42e 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -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@switch_diagnostics # The following are sub-dependencies for which SCOS Sensor enforces a # higher minimum patch version than the dependencies which require them. diff --git a/src/requirements.txt b/src/requirements.txt index 12bb04ea..edd7f8e4 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -151,7 +151,7 @@ scipy==1.10.1 # via scos-actions scos-actions @ git+https://github.com/NTIA/scos-actions@switch_diagnostics # via scos-tekrsa -scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.1.5 +scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@switch_diagnostics # via -r requirements.in sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via scos-actions From bc10e57a647facc65f129cb012d8760a5637a7f9 Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Fri, 1 Dec 2023 08:00:57 -0700 Subject: [PATCH 3/4] Update to Preselector 3.1.0 --- src/requirements-dev.txt | 2 +- src/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index 7aa09d82..74e9f38e 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -142,7 +142,7 @@ inflection==0.5.1 # drf-yasg iniconfig==2.0.0 # via pytest -its-preselector @ git+https://github.com/NTIA/Preselector@analog_inputs +its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0 # via # -r requirements.txt # scos-actions diff --git a/src/requirements.txt b/src/requirements.txt index edd7f8e4..bbaf579e 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -65,7 +65,7 @@ idna==3.4 # via requests inflection==0.5.1 # via drf-yasg -its-preselector @ git+https://github.com/NTIA/Preselector@analog_inputs +its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0 # via scos-actions itypes==1.2.0 # via coreapi From fca01bfb99d8ab384318f9b1a839ad92cc5701bc Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Fri, 1 Dec 2023 14:45:25 -0700 Subject: [PATCH 4/4] Set scos dependencies to release versions. --- src/requirements-dev.txt | 4 ++-- src/requirements.in | 2 +- src/requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index 74e9f38e..b44a9aae 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -321,11 +321,11 @@ scipy==1.10.1 # via # -r requirements.txt # scos-actions -scos-actions @ git+https://github.com/NTIA/scos-actions@switch_diagnostics +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@switch_diagnostics +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 diff --git a/src/requirements.in b/src/requirements.in index c794a42e..737c083f 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -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@switch_diagnostics +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. diff --git a/src/requirements.txt b/src/requirements.txt index bbaf579e..c6b3bb12 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -149,9 +149,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@switch_diagnostics +scos-actions @ git+https://github.com/NTIA/scos-actions@7.0.0 # via scos-tekrsa -scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@switch_diagnostics +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