diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py b/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py index 05a06ce..7cdcd73 100644 --- a/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py +++ b/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py @@ -357,7 +357,7 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False): try: if device_type == "pluto": - from src.ria_toolkit_oss.sdr.pluto import Pluto + from ria_toolkit_oss.sdr.pluto import Pluto if ip_addr: return Pluto(identifier=ip_addr) @@ -365,17 +365,17 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False): return Pluto() elif device_type == "hackrf": - from src.ria_toolkit_oss.sdr.hackrf import HackRF + from ria_toolkit_oss.sdr.hackrf import HackRF return HackRF() elif device_type == "bladerf": - from src.ria_toolkit_oss.sdr.blade import Blade + from ria_toolkit_oss.sdr.blade import Blade return Blade() elif device_type == "usrp": - from src.ria_toolkit_oss.sdr.usrp import USRP + from ria_toolkit_oss.sdr.usrp import USRP if ip_addr: return USRP(identifier=f"addr={ip_addr}") @@ -385,12 +385,12 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False): return USRP() elif device_type == "rtlsdr": - from src.ria_toolkit_oss.sdr.rtlsdr import RTLSDR + from ria_toolkit_oss.sdr.rtlsdr import RTLSDR return RTLSDR() elif device_type == "thinkrf": - from src.ria_toolkit_oss.sdr.thinkrf import ThinkRF + from ria_toolkit_oss.sdr.thinkrf import ThinkRF if ip_addr: return ThinkRF(identifier=ip_addr) diff --git a/tests/ria_toolkit_oss_cli/test_capture.py b/tests/ria_toolkit_oss_cli/test_capture.py index 7e83c1b..63386fd 100644 --- a/tests/ria_toolkit_oss_cli/test_capture.py +++ b/tests/ria_toolkit_oss_cli/test_capture.py @@ -27,7 +27,7 @@ class TestGetSdrDevice: mock_sdr_instance = MagicMock() mock_sdr_class.return_value = mock_sdr_instance - with patch.dict("sys.modules", {"src.ria_toolkit_oss.sdr.pluto": MagicMock(Pluto=mock_sdr_class)}): + with patch.dict("sys.modules", {"ria_toolkit_oss.sdr.pluto": MagicMock(Pluto=mock_sdr_class)}): device = get_sdr_device("pluto") assert device is mock_sdr_instance @@ -37,7 +37,7 @@ class TestGetSdrDevice: mock_sdr_instance = MagicMock() mock_sdr_class.return_value = mock_sdr_instance - with patch.dict("sys.modules", {"src.ria_toolkit_oss.sdr.hackrf": MagicMock(HackRF=mock_sdr_class)}): + with patch.dict("sys.modules", {"ria_toolkit_oss.sdr.hackrf": MagicMock(HackRF=mock_sdr_class)}): device = get_sdr_device("hackrf") assert device is mock_sdr_instance diff --git a/tests/ria_toolkit_oss_cli/test_transmit.py b/tests/ria_toolkit_oss_cli/test_transmit.py index 39325d9..2089816 100644 --- a/tests/ria_toolkit_oss_cli/test_transmit.py +++ b/tests/ria_toolkit_oss_cli/test_transmit.py @@ -27,7 +27,7 @@ class TestGetTxDevice: mock_sdr_instance = MagicMock() mock_sdr_class.return_value = mock_sdr_instance - with patch.dict("sys.modules", {"src.ria_toolkit_oss.sdr.pluto": MagicMock(Pluto=mock_sdr_class)}): + with patch.dict("sys.modules", {"ria_toolkit_oss.sdr.pluto": MagicMock(Pluto=mock_sdr_class)}): device = get_sdr_device("pluto") assert device is mock_sdr_instance @@ -37,7 +37,7 @@ class TestGetTxDevice: mock_sdr_instance = MagicMock() mock_sdr_class.return_value = mock_sdr_instance - with patch.dict("sys.modules", {"src.ria_toolkit_oss.sdr.hackrf": MagicMock(HackRF=mock_sdr_class)}): + with patch.dict("sys.modules", {"ria_toolkit_oss.sdr.hackrf": MagicMock(HackRF=mock_sdr_class)}): device = get_sdr_device("hackrf") assert device is mock_sdr_instance diff --git a/tests/ria_toolkit_oss_cli/test_transmit_generate.py b/tests/ria_toolkit_oss_cli/test_transmit_generate.py index f4a3e0e..85bc1ed 100644 --- a/tests/ria_toolkit_oss_cli/test_transmit_generate.py +++ b/tests/ria_toolkit_oss_cli/test_transmit_generate.py @@ -2,7 +2,7 @@ from click.testing import CliRunner -from src.ria_toolkit_oss.ria_toolkit_oss_cli.cli import cli +from ria_toolkit_oss_cli.cli import cli class TestTransmitGenerate: