SCOS Actions 6.2.1

configs/sensor_definition.json

@@ -1,29 +1,66 @@
 {
-  "id": "seadog",
+  "id": "OVERWRITTEN BY FQDN ENVIRONMENT VARIABLE",
+  "location": {
+    "x": -105.26208,
+    "y": 39.99473,
+    "z": 1700.0,
+    "description": "SENSOR LOCATION, X=LON, Y=LAT, Z=ALTITUDE"
+  },
   "sensor_spec": {
-      "id": "seadog",
-      "model": "seadog"
+      "id": "UNIQUE SENSOR ID",
+      "model": "SENSOR MODEL",
+      "version": "SENSOR VERSION"
   },
   "antenna": {
       "antenna_spec": {
-          "id": "",
-          "model": "None"
+          "id": "UNIQUE ANTENNA ID",
+          "model": "ANTENNA MODEL"
       }
   },
   "preselector" : {
       "preselector_spec" : {
-        "supplemental_information" : "Oldest rev preselector with no enclosure"
+        "id": "UNIQUE PRESELECTOR ID",
+        "model": "PRESELECTOR MODEL",
+        "version": "PRESELECTOR VERSION"
       },
-      "cal_sources" : [ { "enr": 14.53 } ]
+      "cal_sources" : [
+        {
+            "cal_source_spec": {
+                "id": "UNIQUE NOISE SOURCE ID",
+                "model": "NOISE SOURCE MODEL"
+            },
+            "type": "NOISE SOURCE TYPE",
+            "enr": -999.9
+        }
+    ],
+    "amplifiers": [
+        {
+            "amplifier_spec": {
+                "id": "UNIQUE AMPLIFIER ID",
+                "model": "AMPLIFIER MODEL"
+            },
+            "gain": 1.0,
+            "noise_figure": 0.0
+        }
+    ],
+    "filters": [
+        {
+            "filter_spec": {
+                "id": "UNIQUE FILTER ID",
+                "model": "FILTER MODEL"
+            }
+        }
+    ]
   },
   "signal_analyzer": {
       "sigan_spec": {
-          "id": "",
-          "model": "Tektronix RSA 507A"
+          "id": "UNIQUE SIGNAL ANALYZER ID",
+          "model": "SIGNAL ANALYZER MODEL"
       }
   },
   "computer_spec": {
-      "id": "",
-      "model": "Intel NUC"
-  }
+      "id": "UNIQUE COMPUTER ID",
+      "model": "COMPUTER MODEL"
+  },
+  "mobile": false
 }

src/conftest.py

@@ -24,7 +24,7 @@ def cleanup_db(db):
     shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def testclock():
     """Replace scheduler's timefn with manually steppable test timefn."""
     # Setup test clock

src/requirements-dev.txt

@@ -300,11 +300,11 @@ scipy==1.10.1
     # via
     #   -r requirements.txt
     #   scos-actions
-scos_actions @ git+https://github.com/NTIA/scos-actions@6.2.0
+scos_actions @ git+https://github.com/NTIA/scos-actions@6.2.1
     # via
     #   -r requirements.txt
     #   scos-tekrsa
-scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.0.2
+scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.0.3
     # via -r requirements.txt
 sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive
     # via

src/requirements.in

@@ -14,5 +14,5 @@ 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_actions @ git+https://github.com/NTIA/scos-actions@6.2.0
-scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.0.2
+scos_actions @ git+https://github.com/NTIA/scos-actions@6.2.1
+scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.0.3

src/requirements.txt

@@ -180,11 +180,11 @@ ruamel-yaml-clib==0.2.7
     # via ruamel-yaml
 scipy==1.10.1
     # via scos-actions
-scos_actions @ git+https://github.com/NTIA/scos-actions@6.2.0
+scos_actions @ git+https://github.com/NTIA/scos-actions@6.2.1
     # via
     #   -r requirements.in
     #   scos-tekrsa
-scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.0.2
+scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.0.3
     # via -r requirements.in
 sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive
     # via scos-actions

src/sensor/utils.py

@@ -13,9 +13,9 @@ def get_datetime_from_timestamp(ts):
     return datetime.fromtimestamp(ts)
 
 
-def get_timestamp_from_datetime(dt):
+def get_timestamp_from_datetime(dt: datetime):
     """Assumes UTC datetime."""
-    return int(dt.strftime("%s"))
+    return int(dt.strftime("%S"))
 
 
 def parse_datetime_str(d):

src/tasks/tests/test_list_view.py

@@ -35,7 +35,7 @@ def test_user_cannot_view_result_list(admin_client, user_client):
     url = reverse_result_list(entry_name)
     response = user_client.get(url, **HTTPS_KWARG)
     rjson = validate_response(response, status.HTTP_403_FORBIDDEN)
-    return "results" not in rjson
+    assert "results" not in rjson
 
 
 @pytest.mark.django_db