Merge branch 'dev-11-REF-create-cli-tools-folders' into 'main'

Dev 11 ref create cli tools folders

See merge request odoo-openupgrade-wizard/odoo-openupgrade-wizard!12

odoo_openupgrade_wizard/cli/cli.py

@@ -9,21 +9,23 @@ from click_loglevel import LogLevel
 from loguru import logger
 
 import odoo_openupgrade_wizard
-from odoo_openupgrade_wizard.cli_docker_build import docker_build
-from odoo_openupgrade_wizard.cli_estimate_workload import estimate_workload
-from odoo_openupgrade_wizard.cli_execute_script_python import (
+from odoo_openupgrade_wizard.cli.cli_docker_build import docker_build
+from odoo_openupgrade_wizard.cli.cli_estimate_workload import estimate_workload
+from odoo_openupgrade_wizard.cli.cli_execute_script_python import (
     execute_script_python,
 )
-from odoo_openupgrade_wizard.cli_execute_script_sql import execute_script_sql
-from odoo_openupgrade_wizard.cli_generate_module_analysis import (
+from odoo_openupgrade_wizard.cli.cli_execute_script_sql import (
+    execute_script_sql,
+)
+from odoo_openupgrade_wizard.cli.cli_generate_module_analysis import (
     generate_module_analysis,
 )
-from odoo_openupgrade_wizard.cli_get_code import get_code
-from odoo_openupgrade_wizard.cli_init import init
-from odoo_openupgrade_wizard.cli_install_from_csv import install_from_csv
-from odoo_openupgrade_wizard.cli_run import run
-from odoo_openupgrade_wizard.cli_upgrade import upgrade
-from odoo_openupgrade_wizard.tools_system import ensure_folder_exists
+from odoo_openupgrade_wizard.cli.cli_get_code import get_code
+from odoo_openupgrade_wizard.cli.cli_init import init
+from odoo_openupgrade_wizard.cli.cli_install_from_csv import install_from_csv
+from odoo_openupgrade_wizard.cli.cli_run import run
+from odoo_openupgrade_wizard.cli.cli_upgrade import upgrade
+from odoo_openupgrade_wizard.tools.tools_system import ensure_folder_exists
 
 
 @click.group()

odoo_openupgrade_wizard/cli/cli_docker_build.py

@@ -1,12 +1,12 @@
 import click
 from loguru import logger
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     get_odoo_versions_from_options,
     versions_options,
 )
-from odoo_openupgrade_wizard.tools_docker import build_image, pull_image
-from odoo_openupgrade_wizard.tools_odoo import (
+from odoo_openupgrade_wizard.tools.tools_docker import build_image, pull_image
+from odoo_openupgrade_wizard.tools.tools_odoo import (
     get_docker_image_tag,
     get_odoo_env_path,
 )

odoo_openupgrade_wizard/cli/cli_estimate_workload.py

@@ -3,9 +3,9 @@ from pathlib import Path
 
 import click
 
-from odoo_openupgrade_wizard.tools_odoo import get_odoo_modules_from_csv
-from odoo_openupgrade_wizard.tools_odoo_module import Analysis
-from odoo_openupgrade_wizard.tools_system import (
+from odoo_openupgrade_wizard.tools.tools_odoo import get_odoo_modules_from_csv
+from odoo_openupgrade_wizard.tools.tools_odoo_module import Analysis
+from odoo_openupgrade_wizard.tools.tools_system import (
     ensure_file_exists_from_template,
 )
 

odoo_openupgrade_wizard/cli/cli_execute_script_python.py

@@ -2,12 +2,14 @@ from pathlib import Path
 
 import click
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     database_option_required,
     get_migration_step_from_options,
     step_option,
 )
-from odoo_openupgrade_wizard.tools_odoo import execute_click_odoo_python_files
+from odoo_openupgrade_wizard.tools.tools_odoo import (
+    execute_click_odoo_python_files,
+)
 
 
 @click.command()

odoo_openupgrade_wizard/cli/cli_execute_script_sql.py

@@ -2,12 +2,12 @@ from pathlib import Path
 
 import click
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     database_option_required,
     get_migration_step_from_options,
     step_option,
 )
-from odoo_openupgrade_wizard.tools_postgres import (
+from odoo_openupgrade_wizard.tools.tools_postgres import (
     execute_sql_files_pre_migration,
 )
 

odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py

@@ -1,7 +1,7 @@
 import click
 from loguru import logger
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     database_option,
     get_migration_steps_from_options,
     step_option,
@@ -12,13 +12,13 @@ from odoo_openupgrade_wizard.configuration_version_dependant import (
     get_installable_odoo_modules,
     get_upgrade_analysis_module,
 )
-from odoo_openupgrade_wizard.tools_odoo import (
+from odoo_openupgrade_wizard.tools.tools_odoo import (
     get_odoo_env_path,
     kill_odoo,
     run_odoo,
 )
-from odoo_openupgrade_wizard.tools_odoo_instance import OdooInstance
-from odoo_openupgrade_wizard.tools_system import ensure_folder_writable
+from odoo_openupgrade_wizard.tools.tools_odoo_instance import OdooInstance
+from odoo_openupgrade_wizard.tools.tools_system import ensure_folder_writable
 
 
 @click.command()

odoo_openupgrade_wizard/cli/cli_get_code.py

@@ -1,11 +1,11 @@
 import click
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     get_odoo_versions_from_options,
     versions_options,
 )
-from odoo_openupgrade_wizard.tools_odoo import get_odoo_env_path
-from odoo_openupgrade_wizard.tools_system import git_aggregate
+from odoo_openupgrade_wizard.tools.tools_odoo import get_odoo_env_path
+from odoo_openupgrade_wizard.tools.tools_system import git_aggregate
 
 
 @click.command()

odoo_openupgrade_wizard/cli/cli_init.py

@@ -8,8 +8,8 @@ from odoo_openupgrade_wizard.configuration_version_dependant import (
     get_python_major_version,
     get_version_options,
 )
-from odoo_openupgrade_wizard.tools_odoo import get_odoo_env_path
-from odoo_openupgrade_wizard.tools_system import (
+from odoo_openupgrade_wizard.tools.tools_odoo import get_odoo_env_path
+from odoo_openupgrade_wizard.tools.tools_system import (
     ensure_file_exists_from_template,
     ensure_folder_exists,
 )

odoo_openupgrade_wizard/cli/cli_install_from_csv.py

@@ -1,17 +1,17 @@
 import click
 from loguru import logger
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     database_option,
     get_migration_step_from_options,
 )
-from odoo_openupgrade_wizard.tools_odoo import (
+from odoo_openupgrade_wizard.tools.tools_odoo import (
     get_odoo_modules_from_csv,
     kill_odoo,
     run_odoo,
 )
-from odoo_openupgrade_wizard.tools_odoo_instance import OdooInstance
-from odoo_openupgrade_wizard.tools_postgres import ensure_database
+from odoo_openupgrade_wizard.tools.tools_odoo_instance import OdooInstance
+from odoo_openupgrade_wizard.tools.tools_postgres import ensure_database
 
 
 @click.command()

odoo_openupgrade_wizard/cli/cli_run.py

@@ -1,13 +1,13 @@
 import click
 from loguru import logger
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     database_option,
     get_migration_step_from_options,
     step_option,
 )
-from odoo_openupgrade_wizard.tools_odoo import kill_odoo, run_odoo
-from odoo_openupgrade_wizard.tools_postgres import ensure_database
+from odoo_openupgrade_wizard.tools.tools_odoo import kill_odoo, run_odoo
+from odoo_openupgrade_wizard.tools.tools_postgres import ensure_database
 
 
 @click.command()

odoo_openupgrade_wizard/cli/cli_upgrade.py

@@ -1,13 +1,13 @@
 import click
 from loguru import logger
 
-from odoo_openupgrade_wizard.cli_options import (
+from odoo_openupgrade_wizard.cli.cli_options import (
     database_option_required,
     first_step_option,
     get_migration_steps_from_options,
     last_step_option,
 )
-from odoo_openupgrade_wizard.tools_odoo import (
+from odoo_openupgrade_wizard.tools.tools_odoo import (
     execute_click_odoo_python_files,
     kill_odoo,
     run_odoo,

odoo_openupgrade_wizard/tools/tools_odoo.py

@@ -15,9 +15,12 @@ from odoo_openupgrade_wizard.configuration_version_dependant import (
     get_server_wide_modules_upgrade,
     skip_addon_path,
 )
-from odoo_openupgrade_wizard.tools_docker import kill_container, run_container
-from odoo_openupgrade_wizard.tools_postgres import get_postgres_container
-from odoo_openupgrade_wizard.tools_system import get_script_folder
+from odoo_openupgrade_wizard.tools.tools_docker import (
+    kill_container,
+    run_container,
+)
+from odoo_openupgrade_wizard.tools.tools_postgres import get_postgres_container
+from odoo_openupgrade_wizard.tools.tools_system import get_script_folder
 
 
 def get_odoo_addons_path(

odoo_openupgrade_wizard/tools/tools_odoo_module.py

@@ -13,7 +13,7 @@ from odoo_openupgrade_wizard.configuration_version_dependant import (
     get_coverage_relative_path,
     get_openupgrade_analysis_files,
 )
-from odoo_openupgrade_wizard.tools_odoo import (
+from odoo_openupgrade_wizard.tools.tools_odoo import (
     get_odoo_addons_path,
     get_odoo_env_path,
 )

odoo_openupgrade_wizard/tools/tools_postgres.py

@@ -4,11 +4,11 @@ from pathlib import Path
 
 from loguru import logger
 
-from odoo_openupgrade_wizard.tools_docker import (
+from odoo_openupgrade_wizard.tools.tools_docker import (
     get_docker_client,
     run_container,
 )
-from odoo_openupgrade_wizard.tools_system import get_script_folder
+from odoo_openupgrade_wizard.tools.tools_system import get_script_folder
 
 
 def get_postgres_container(ctx):

poetry.lock

@@ -360,7 +360,7 @@ plugins = ["setuptools"]
 name = "jinja2"
 version = "3.0.3"
 description = "A very fast and expressive template engine."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 
@@ -409,7 +409,7 @@ dev = ["colorama (>=0.3.4)", "docutils (==0.16)", "flake8 (>=3.7.7)", "tox (>=3.
 name = "markupsafe"
 version = "2.0.1"
 description = "Safely add untrusted strings to HTML/XML markup."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 
@@ -862,7 +862,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.6.3,<4.0.0"
-content-hash = "cf6e4e8a8d4c26f956c108ccf66ac8e1b074c92bdf3c962537f55fb93bdddf10"
+content-hash = "83c796afe3bead38187a2cd46deab78c3b6311c416d583b20fb077014d01f139"
 
 [metadata.files]
 aiocontextvars = [

pyproject.toml

@@ -31,15 +31,16 @@ odoo-openupgrade-wizard = "odoo_openupgrade_wizard.cli:main"
 python = ">=3.6.3,<4.0.0"
 click = "^7.0"
 click-loglevel = "^0.4"
-odoorpc = "^0.8"
-loguru = "^0.6"
-plumbum = "^1.7"
-single-source = "^0.3"
-git-aggregator = "^2.1"
 docker = "^5.0"
-pyyaml = "5.4.1"
+git-aggregator = "^2.1"
 GitPython = "^3.1"
+jinja2 = "^3.0"
+loguru = "^0.6"
+odoorpc = "^0.8"
+plumbum = "^1.7"
 pygount = "^1.4"
+pyyaml = "5.4.1"
+single-source = "^0.3"
 
 [tool.poetry.dev-dependencies]
 pytest = [

tests/__init__.py

@@ -6,7 +6,7 @@ import yaml
 from click.testing import CliRunner
 from plumbum.cmd import mkdir
 
-from odoo_openupgrade_wizard.cli import main
+from odoo_openupgrade_wizard.cli.cli import main
 
 _logger = logging.getLogger()
 

tests/cli_03_docker_build_test.py

@@ -1,4 +1,4 @@
-from odoo_openupgrade_wizard.tools_docker import get_docker_client
+from odoo_openupgrade_wizard.tools.tools_docker import get_docker_client
 
 from . import cli_runner_invoke, move_to_test_folder
 

tests/cli_04_run_test.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
-from odoo_openupgrade_wizard.tools_docker import get_docker_client
-from odoo_openupgrade_wizard.tools_postgres import execute_sql_request
+from odoo_openupgrade_wizard.tools.tools_docker import get_docker_client
+from odoo_openupgrade_wizard.tools.tools_postgres import execute_sql_request
 
 from . import (
     build_ctx_from_config_file,

tests/cli_05_execute_script_python_test.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 from plumbum.cmd import cp
 
-from odoo_openupgrade_wizard.tools_postgres import execute_sql_request
+from odoo_openupgrade_wizard.tools.tools_postgres import execute_sql_request
 
 from . import (
     build_ctx_from_config_file,

tests/cli_06_execute_script_sql_test.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 from plumbum.cmd import cp
 
-from odoo_openupgrade_wizard.tools_postgres import (
+from odoo_openupgrade_wizard.tools.tools_postgres import (
     ensure_database,
     execute_sql_request,
 )

tests/cli_07_upgrade_test.py

@@ -1,4 +1,4 @@
-from odoo_openupgrade_wizard.tools_postgres import (
+from odoo_openupgrade_wizard.tools.tools_postgres import (
     ensure_database,
     execute_sql_request,
 )

tests/cli_20_install_from_csv_test.py

@@ -1,4 +1,4 @@
-from odoo_openupgrade_wizard.tools_postgres import (
+from odoo_openupgrade_wizard.tools.tools_postgres import (
     ensure_database,
     execute_sql_request,
 )

tests/cli_21_generate_module_analysis_test.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from odoo_openupgrade_wizard.tools_odoo import get_odoo_env_path
+from odoo_openupgrade_wizard.tools.tools_odoo import get_odoo_env_path
 
 from . import (
     build_ctx_from_config_file,