Move commands file to .cli

Author: simahawk

odoo_tools/addon.py renamed to odoo_tools/cli/addon.py

@@ -3,10 +3,10 @@
 
 import click
 
-from .utils import pending_merge as pm_utils, ui
-from .utils.os_exec import run
-from .utils.pkg import Package
-from .utils.req import get_project_dev_req
+from ..utils import pending_merge as pm_utils, ui
+from ..utils.os_exec import run
+from ..utils.pkg import Package
+from ..utils.req import get_project_dev_req
 
 
 @click.group()

odoo_tools/project.py renamed to odoo_tools/cli/project.py

@@ -5,11 +5,11 @@
 
 import click
 
-from .config import PROJ_CFG_FILE, get_conf_key
-from .utils.misc import SmartDict, copy_file, get_template_path
-from .utils.os_exec import run
-from .utils.path import build_path
-from .utils.proj import get_project_manifest_key
+from ..config import PROJ_CFG_FILE, get_conf_key
+from ..utils.misc import SmartDict, copy_file, get_template_path
+from ..utils.os_exec import run
+from ..utils.path import build_path
+from ..utils.proj import get_project_manifest_key
 
 
 def get_proj_tmpl_ver():

odoo_tools/release.py renamed to odoo_tools/cli/release.py

@@ -3,12 +3,12 @@
 
 import click
 
-from .config import get_conf_key
-from .utils.marabunta import MarabuntaFileHandler
-from .utils.misc import get_ini_cfg_key
-from .utils.os_exec import run
-from .utils.path import build_path
-from .utils.pending_merge import push_branches
+from ..config import get_conf_key
+from ..utils.marabunta import MarabuntaFileHandler
+from ..utils.misc import get_ini_cfg_key
+from ..utils.os_exec import run
+from ..utils.path import build_path
+from ..utils.pending_merge import push_branches
 
 
 def get_bumpversion_cfg_key(cfg_content, key):

pyproject.toml

@@ -49,9 +49,9 @@ repository = "https://github.com/camptocamp/odoo-project-tools"
 
 [project.scripts]
 otools-tasks = "odoo_tools.tasks.main:program.run"
-otools-project = "odoo_tools.project:cli"
-otools-addon = "odoo_tools.addon:cli"
-otools-release = "odoo_tools.release:cli"
+otools-project = "odoo_tools.cli.project:cli"
+otools-addon = "odoo_tools.cli.addon:cli"
+otools-release = "odoo_tools.cli.release:cli"
 
 [project.optional-dependencies]
 test = [

tests/test_addon_add.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
-from odoo_tools import addon
+from odoo_tools.cli import addon
 
 from .common import fake_project_root, mock_pypi_version_cache
 

tests/test_addon_add_pending.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 import os
 
-from odoo_tools import addon
+from odoo_tools.cli import addon
 from odoo_tools.utils.pending_merge import Repo
 from odoo_tools.utils.pkg import Package
 

tests/test_project.py

@@ -4,7 +4,7 @@
 import os
 from unittest import mock
 
-from odoo_tools.project import init
+from odoo_tools.cli.project import init
 
 from .common import compare_line_by_line, fake_project_root, get_fixture
 from .fixtures import clear_caches  # noqa

tests/test_release.py

@@ -4,9 +4,9 @@
 import datetime
 from unittest import mock
 
-from odoo_tools import release
+from odoo_tools.cli import release
+from odoo_tools.cli.project import init
 from odoo_tools.config import get_conf_key
-from odoo_tools.project import init
 
 from .common import (
     compare_line_by_line,