Formatting
Some checks failed
Build Sphinx Docs Set / Build Docs (pull_request) Successful in 1m29s
Test with tox / Test with tox (3.11) (pull_request) Failing after 34s
Test with tox / Test with tox (3.12) (pull_request) Failing after 33s
Test with tox / Test with tox (3.10) (pull_request) Failing after 1m15s
Build Project / Build Project (3.10) (pull_request) Successful in 2m34s
Build Project / Build Project (3.11) (pull_request) Successful in 2m39s
Build Project / Build Project (3.12) (pull_request) Successful in 2m35s

This commit is contained in:
M madrigal 2025-12-19 11:25:06 -05:00
parent 787ad8449b
commit 262d6ce9ee
5 changed files with 19 additions and 33 deletions

View File

@ -338,7 +338,7 @@ def capture(
num_samples = int(duration * sample_rate)
echo_verbose(f"Duration {duration}s = {num_samples} samples at {format_sample_rate(sample_rate)}", verbose)
elif duration is None and num_samples is None:
raise click.ClickException(f"Must provide either --num-samples or --duration")
raise click.ClickException("Must provide either --num-samples or --duration")
# Show capture parameters
echo_progress(f"Capturing from {device.upper()}...", quiet)

View File

@ -9,15 +9,6 @@ import yaml
import ria_toolkit_oss.signal.basic_signal_generator as basic_gen
from ria_toolkit_oss.datatypes import Recording
from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
echo_progress,
echo_verbose,
format_frequency,
format_sample_rate,
parse_metadata_args,
save_recording,
)
from ria_toolkit_oss_cli.ria_toolkit_oss.config import load_user_config
from ria_toolkit_oss.signal.block_generator.basic import FrequencyShift
from ria_toolkit_oss.signal.block_generator.continuous_modulation.fsk_modulator import (
FSKModulator,
@ -51,6 +42,15 @@ from ria_toolkit_oss.signal.block_generator.symbol_modulation import (
from ria_toolkit_oss.transforms.iq_impairments import (
iq_imbalance,
)
from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
echo_progress,
echo_verbose,
format_frequency,
format_sample_rate,
parse_metadata_args,
save_recording,
)
from ria_toolkit_oss_cli.ria_toolkit_oss.config import load_user_config
# Extend Mapper to support new types

View File

@ -10,13 +10,13 @@ import click
from ria_toolkit_oss.datatypes.recording import Recording
from ria_toolkit_oss.io.recording import load_recording
from ria_toolkit_oss.transforms import iq_augmentations, iq_impairments
from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
echo_progress,
echo_verbose,
format_sample_count,
save_recording,
)
from ria_toolkit_oss.transforms import iq_augmentations, iq_impairments
def get_available_transforms(module):

View File

@ -6,10 +6,10 @@ from pathlib import Path
import numpy as np
import pytest
from click.testing import CliRunner
from ria_toolkit_oss_cli.cli import cli
from ria_toolkit_oss.datatypes import Annotation, Recording
from ria_toolkit_oss.io import load_recording, to_npy, to_sigmf
from ria_toolkit_oss_cli.cli import cli
class TestCombineHelp:

View File

@ -63,9 +63,7 @@ class TestAutoSelectTxDevice:
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[]),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[]),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[]
),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[]),
):
with pytest.raises(ClickException) as exc_info:
@ -83,9 +81,7 @@ class TestAutoSelectTxDevice:
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices",
return_value=[{"type": "HackRF One", "serial": "123456"}],
),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[]
),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[]),
):
device_type = auto_select_tx_device(quiet=True)
@ -106,9 +102,7 @@ class TestAutoSelectTxDevice:
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices",
return_value=[{"type": "HackRF One", "serial": "123456"}],
),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[]
),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[]),
):
with pytest.raises(ClickException) as exc_info:
@ -129,15 +123,9 @@ class TestAutoSelectTxDevice:
for device_name, expected_type in test_cases:
with (
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]
),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[]
),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[]
),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[]),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[]),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices",
return_value=[{"type": device_name}],
@ -342,9 +330,7 @@ class TestTransmitCommand:
mock_recording.metadata = {}
with (
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.get_sdr_device", return_value=mock_sdr
),
patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.get_sdr_device", return_value=mock_sdr),
patch(
"ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_input_file",
return_value=mock_recording,