move cli to src/rail/cli/rail (#171)

* move cli to src/rail/cli/rail

* fix import in tests

* fix one more import

* fix typo

pyproject.toml

@@ -38,7 +38,7 @@ dev = [
 ]
 
 [project.scripts]
-rail = "rail.cli.commands:cli"
+rail = "rail.cli.rail.commands:cli"
 
 [build-system]
 requires = [

src/rail/cli/rail/__main__.py

@@ -0,0 +1,5 @@
+# This file must exist with these contents
+from .commands import cli
+
+if __name__ == "__main__":
+    cli()

src/rail/cli/commands.py → src/rail/cli/rail/commands.py

@@ -4,7 +4,7 @@
 import yaml
 
 from rail.core import __version__
-from rail.cli import options, scripts
+from rail.cli.rail import options, scripts
 from rail.interfaces.pz_factory import PZFactory
 from rail.interfaces.tool_factory import ToolFactory
 from rail.utils import catalog_utils

src/rail/cli/scripts.py → src/rail/cli/rail/scripts.py

@@ -4,7 +4,7 @@
 import rail.stages
 from rail.core import RailEnv
 from rail.core.stage import RailPipeline
-from rail.cli.options import GitMode
+from rail.cli.rail.options import GitMode
 from rail.utils.path_utils import RAILDIR
 from rail.utils import catalog_utils
 

src/rail/utils/testing_utils.py

@@ -6,7 +6,7 @@
 from rail.core.stage import RailStage
 from rail.utils.path_utils import RAILDIR
 from rail.core.data import TableHandle
-from rail.cli.scripts import build_pipeline
+from rail.cli.rail.scripts import build_pipeline
 
 traindata = os.path.join(RAILDIR, "rail/examples_data/testdata/training_100gal.hdf5")
 validdata = os.path.join(RAILDIR, "rail/examples_data/testdata/validation_10gal.hdf5")

tests/cli/test_scripts.py

@@ -1,8 +1,8 @@
 import glob
 import os
 import pytest
-from rail.cli import scripts
-from rail.cli.options import args_to_dict, GitMode
+from rail.cli.rail import scripts
+from rail.cli.rail.options import args_to_dict, GitMode