pyproject.toml

@@ -70,7 +70,7 @@ all-sdr = [
 [tool.poetry]
 packages = [
     { include = "ria_toolkit_oss", from = "src" },
-    { include = "ria_toolkit_oss_cli", from = "src/ria_toolkit_oss" }
+    { include = "ria_toolkit_oss_cli", from = "src" }
 ]
 include = [
     "**/*.so",  # Required for Nuitkaification
@@ -101,8 +101,8 @@ pylint = "^3.2.6"  # For pyreverse, to automate the creation of UML diagrams
 "Issues Board" = "https://riahub.ai/qoherent/ria-toolkit-oss/issues"
 
 [tool.poetry.scripts]
-ria = "ria_toolkit_oss.ria_toolkit_oss_cli.cli:cli"
+ria = "ria_toolkit_oss_cli.cli:cli"
-ria-tools = "ria_toolkit_oss.ria_toolkit_oss_cli.cli:cli"
+ria-tools = "ria_toolkit_oss_cli.cli:cli"
 
 [tool.black]
 line-length = 119

src/ria_toolkit_oss_cli/cli.py

@@ -4,7 +4,7 @@ This module contains the main group for the ria toolkit oss CLI.
 
 import click
 
-from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss import commands
+from ria_toolkit_oss_cli.ria_toolkit_oss import commands
 
 
 @click.group()

src/ria_toolkit_oss_cli/ria_toolkit_oss/combine.py

@@ -9,7 +9,7 @@ import numpy as np
 
 from ria_toolkit_oss.datatypes import Recording
 from ria_toolkit_oss.io import from_npy_legacy, load_recording
-from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import (
+from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
     echo_progress,
     echo_verbose,
     format_sample_count,

src/ria_toolkit_oss_cli/ria_toolkit_oss/convert.py

@@ -13,7 +13,7 @@ from ria_toolkit_oss.io.recording import (
     to_sigmf,
     to_wav,
 )
-from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import (
+from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
     check_for_overwriting,
     detect_file_format,
     echo_progress,

src/ria_toolkit_oss_cli/ria_toolkit_oss/generate.py

@@ -9,7 +9,7 @@ import yaml
 
 import ria_toolkit_oss.signal.basic_signal_generator as basic_gen
 from ria_toolkit_oss.datatypes import Recording
-from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import (
+from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
     echo_progress,
     echo_verbose,
     format_frequency,
@@ -17,7 +17,7 @@ from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import (
     parse_metadata_args,
     save_recording,
 )
-from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.config import load_user_config
+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,

src/ria_toolkit_oss_cli/ria_toolkit_oss/split.py

@@ -6,7 +6,7 @@ import click
 import numpy as np
 
 from ria_toolkit_oss.io import from_npy_legacy, load_recording
-from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import (
+from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
     detect_file_format,
     echo_progress,
     echo_verbose,

src/ria_toolkit_oss_cli/ria_toolkit_oss/transform.py

@@ -10,7 +10,7 @@ import click
 
 from ria_toolkit_oss.datatypes.recording import Recording
 from ria_toolkit_oss.io.recording import load_recording
-from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import (
+from ria_toolkit_oss_cli.ria_toolkit_oss.common import (
     echo_progress,
     echo_verbose,
     format_sample_count,