Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for ntia-diagnostics v1.1.2 #93

Merged
merged 3 commits into from
Oct 23, 2023
Merged

Update for ntia-diagnostics v1.1.2 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfdb046
Update metadata structs for ntia-diagnostics v1.1.2
aromanielloNTIA Oct 20, 2023
ee1e7e5
Modify SEA action to use updated metadata struct
aromanielloNTIA Oct 20, 2023
a35de4f
Bump patch version to 6.4.1
aromanielloNTIA Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scos_actions/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "6.4.0"
__version__ = "6.4.1"
4 changes: 3 additions & 1 deletion scos_actions/actions/acquire_sea_data_product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,9 @@ def capture_diagnostics(self, action_start_tic: float, cpu_speeds: list) -> None
"python_version": sys.version.split()[0],
"scos_sensor_version": SCOS_SENSOR_GIT_TAG,
"scos_actions_version": SCOS_ACTIONS_VERSION,
"scos_tekrsa_version": self.sigan.plugin_version,
"scos_sigan_plugin": ntia_diagnostics.ScosPlugin(
name="scos_tekrsa", version=self.sigan.plugin_version
),
"preselector_api_version": PRESELECTOR_API_VERSION,
}

Expand Down
2 changes: 1 addition & 1 deletion scos_actions/metadata/sigmf_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"name": "ntia-diagnostics",
"version": "v1.1.1",
"version": "v1.1.2",
"optional": True,
},
{
Expand Down
16 changes: 14 additions & 2 deletions scos_actions/metadata/structs/ntia_diagnostics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,17 @@ class Computer(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
ssd_smart_data: Optional[SsdSmartData] = None


class ScosPlugin(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
"""
Interface for generating `ntia-diagnostics` `ScosPlugin` objects.

:param name: The Python package name as it is imported, e.g., `"scos_tekrsa"`
:param version: Version of the SCOS plugin.
"""
name: Optional[str] = None
version: Optional[str] = None


class Software(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
"""
Interface for generating `ntia-diagnostics` `Software` objects.
Expand All @@ -127,15 +138,16 @@ class Software(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
:param python_version: The Python version, as returned by `sys.version()`.
:param scos_sensor_version: The SCOS Sensor version, as returned by `git describe --tags`.
:param scos_actions_version: Version of `scos_actions` plugin.
:param scos_tekrs_version: Version of `scos_tekrsa` plugin.
:param scos_sigan_plugin: `ScosPlugin` object describing the plugin which defines the
signal analyzer interface.
:param preselector_api_version: Version of the NTIA `preselector` package.
"""

system_platform: Optional[str] = None
python_version: Optional[str] = None
scos_sensor_version: Optional[str] = None
scos_actions_version: Optional[str] = None
scos_tekrsa_version: Optional[str] = None
scos_sigan_plugin: Optional[ScosPlugin] = None
preselector_api_version: Optional[str] = None


Expand Down