From b37bfa8e3128956e6dd219211f7a68e19c6a8f0b Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Mon, 27 Jun 2022 01:57:31 +0200 Subject: [PATCH 1/2] [REF] create tools & cli folders --- odoo_openupgrade_wizard/{ => cli}/cli.py | 24 ++++++++++--------- .../{ => cli}/cli_docker_build.py | 6 ++--- .../{ => cli}/cli_estimate_workload.py | 6 ++--- .../{ => cli}/cli_execute_script_python.py | 6 +++-- .../{ => cli}/cli_execute_script_sql.py | 4 ++-- .../{ => cli}/cli_generate_module_analysis.py | 8 +++---- .../{ => cli}/cli_get_code.py | 6 ++--- odoo_openupgrade_wizard/{ => cli}/cli_init.py | 4 ++-- .../{ => cli}/cli_install_from_csv.py | 8 +++---- .../{ => cli}/cli_options.py | 0 odoo_openupgrade_wizard/{ => cli}/cli_run.py | 6 ++--- .../{ => cli}/cli_upgrade.py | 4 ++-- .../{ => tools}/tools_docker.py | 0 .../{ => tools}/tools_odoo.py | 9 ++++--- .../{ => tools}/tools_odoo_instance.py | 0 .../{ => tools}/tools_odoo_module.py | 2 +- .../{ => tools}/tools_postgres.py | 4 ++-- .../{ => tools}/tools_system.py | 0 tests/__init__.py | 2 +- tests/cli_03_docker_build_test.py | 2 +- tests/cli_04_run_test.py | 4 ++-- tests/cli_05_execute_script_python_test.py | 2 +- tests/cli_06_execute_script_sql_test.py | 2 +- tests/cli_07_upgrade_test.py | 2 +- tests/cli_20_install_from_csv_test.py | 2 +- tests/cli_21_generate_module_analysis_test.py | 2 +- 26 files changed, 61 insertions(+), 54 deletions(-) rename odoo_openupgrade_wizard/{ => cli}/cli.py (82%) rename odoo_openupgrade_wizard/{ => cli}/cli_docker_build.py (81%) rename odoo_openupgrade_wizard/{ => cli}/cli_estimate_workload.py (86%) rename odoo_openupgrade_wizard/{ => cli}/cli_execute_script_python.py (82%) rename odoo_openupgrade_wizard/{ => cli}/cli_execute_script_sql.py (86%) rename odoo_openupgrade_wizard/{ => cli}/cli_generate_module_analysis.py (94%) rename odoo_openupgrade_wizard/{ => cli}/cli_get_code.py (76%) rename odoo_openupgrade_wizard/{ => cli}/cli_init.py (97%) rename odoo_openupgrade_wizard/{ => cli}/cli_install_from_csv.py (90%) rename odoo_openupgrade_wizard/{ => cli}/cli_options.py (100%) rename odoo_openupgrade_wizard/{ => cli}/cli_run.py (89%) rename odoo_openupgrade_wizard/{ => cli}/cli_upgrade.py (90%) rename odoo_openupgrade_wizard/{ => tools}/tools_docker.py (100%) rename odoo_openupgrade_wizard/{ => tools}/tools_odoo.py (97%) rename odoo_openupgrade_wizard/{ => tools}/tools_odoo_instance.py (100%) rename odoo_openupgrade_wizard/{ => tools}/tools_odoo_module.py (99%) rename odoo_openupgrade_wizard/{ => tools}/tools_postgres.py (97%) rename odoo_openupgrade_wizard/{ => tools}/tools_system.py (100%) diff --git a/odoo_openupgrade_wizard/cli.py b/odoo_openupgrade_wizard/cli/cli.py similarity index 82% rename from odoo_openupgrade_wizard/cli.py rename to odoo_openupgrade_wizard/cli/cli.py index fad64af..1bfbb1a 100644 --- a/odoo_openupgrade_wizard/cli.py +++ b/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() diff --git a/odoo_openupgrade_wizard/cli_docker_build.py b/odoo_openupgrade_wizard/cli/cli_docker_build.py similarity index 81% rename from odoo_openupgrade_wizard/cli_docker_build.py rename to odoo_openupgrade_wizard/cli/cli_docker_build.py index 2543794..1008216 100644 --- a/odoo_openupgrade_wizard/cli_docker_build.py +++ b/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, ) diff --git a/odoo_openupgrade_wizard/cli_estimate_workload.py b/odoo_openupgrade_wizard/cli/cli_estimate_workload.py similarity index 86% rename from odoo_openupgrade_wizard/cli_estimate_workload.py rename to odoo_openupgrade_wizard/cli/cli_estimate_workload.py index 621b70a..c8507c7 100644 --- a/odoo_openupgrade_wizard/cli_estimate_workload.py +++ b/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, ) diff --git a/odoo_openupgrade_wizard/cli_execute_script_python.py b/odoo_openupgrade_wizard/cli/cli_execute_script_python.py similarity index 82% rename from odoo_openupgrade_wizard/cli_execute_script_python.py rename to odoo_openupgrade_wizard/cli/cli_execute_script_python.py index 62e3cdc..e50134c 100644 --- a/odoo_openupgrade_wizard/cli_execute_script_python.py +++ b/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() diff --git a/odoo_openupgrade_wizard/cli_execute_script_sql.py b/odoo_openupgrade_wizard/cli/cli_execute_script_sql.py similarity index 86% rename from odoo_openupgrade_wizard/cli_execute_script_sql.py rename to odoo_openupgrade_wizard/cli/cli_execute_script_sql.py index 23a2129..39471d2 100644 --- a/odoo_openupgrade_wizard/cli_execute_script_sql.py +++ b/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, ) diff --git a/odoo_openupgrade_wizard/cli_generate_module_analysis.py b/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py similarity index 94% rename from odoo_openupgrade_wizard/cli_generate_module_analysis.py rename to odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py index cab86fc..ad80256 100644 --- a/odoo_openupgrade_wizard/cli_generate_module_analysis.py +++ b/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() diff --git a/odoo_openupgrade_wizard/cli_get_code.py b/odoo_openupgrade_wizard/cli/cli_get_code.py similarity index 76% rename from odoo_openupgrade_wizard/cli_get_code.py rename to odoo_openupgrade_wizard/cli/cli_get_code.py index cb85bd4..14dfd9d 100644 --- a/odoo_openupgrade_wizard/cli_get_code.py +++ b/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() diff --git a/odoo_openupgrade_wizard/cli_init.py b/odoo_openupgrade_wizard/cli/cli_init.py similarity index 97% rename from odoo_openupgrade_wizard/cli_init.py rename to odoo_openupgrade_wizard/cli/cli_init.py index 4737810..24f6ac4 100644 --- a/odoo_openupgrade_wizard/cli_init.py +++ b/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, ) diff --git a/odoo_openupgrade_wizard/cli_install_from_csv.py b/odoo_openupgrade_wizard/cli/cli_install_from_csv.py similarity index 90% rename from odoo_openupgrade_wizard/cli_install_from_csv.py rename to odoo_openupgrade_wizard/cli/cli_install_from_csv.py index 4c9d807..3ebdeff 100644 --- a/odoo_openupgrade_wizard/cli_install_from_csv.py +++ b/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() diff --git a/odoo_openupgrade_wizard/cli_options.py b/odoo_openupgrade_wizard/cli/cli_options.py similarity index 100% rename from odoo_openupgrade_wizard/cli_options.py rename to odoo_openupgrade_wizard/cli/cli_options.py diff --git a/odoo_openupgrade_wizard/cli_run.py b/odoo_openupgrade_wizard/cli/cli_run.py similarity index 89% rename from odoo_openupgrade_wizard/cli_run.py rename to odoo_openupgrade_wizard/cli/cli_run.py index e922270..444f61b 100644 --- a/odoo_openupgrade_wizard/cli_run.py +++ b/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() diff --git a/odoo_openupgrade_wizard/cli_upgrade.py b/odoo_openupgrade_wizard/cli/cli_upgrade.py similarity index 90% rename from odoo_openupgrade_wizard/cli_upgrade.py rename to odoo_openupgrade_wizard/cli/cli_upgrade.py index f4a9b37..ba95ec8 100644 --- a/odoo_openupgrade_wizard/cli_upgrade.py +++ b/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, diff --git a/odoo_openupgrade_wizard/tools_docker.py b/odoo_openupgrade_wizard/tools/tools_docker.py similarity index 100% rename from odoo_openupgrade_wizard/tools_docker.py rename to odoo_openupgrade_wizard/tools/tools_docker.py diff --git a/odoo_openupgrade_wizard/tools_odoo.py b/odoo_openupgrade_wizard/tools/tools_odoo.py similarity index 97% rename from odoo_openupgrade_wizard/tools_odoo.py rename to odoo_openupgrade_wizard/tools/tools_odoo.py index f6e664b..bd19a7b 100644 --- a/odoo_openupgrade_wizard/tools_odoo.py +++ b/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( diff --git a/odoo_openupgrade_wizard/tools_odoo_instance.py b/odoo_openupgrade_wizard/tools/tools_odoo_instance.py similarity index 100% rename from odoo_openupgrade_wizard/tools_odoo_instance.py rename to odoo_openupgrade_wizard/tools/tools_odoo_instance.py diff --git a/odoo_openupgrade_wizard/tools_odoo_module.py b/odoo_openupgrade_wizard/tools/tools_odoo_module.py similarity index 99% rename from odoo_openupgrade_wizard/tools_odoo_module.py rename to odoo_openupgrade_wizard/tools/tools_odoo_module.py index 0ddc7c6..d13af25 100644 --- a/odoo_openupgrade_wizard/tools_odoo_module.py +++ b/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, ) diff --git a/odoo_openupgrade_wizard/tools_postgres.py b/odoo_openupgrade_wizard/tools/tools_postgres.py similarity index 97% rename from odoo_openupgrade_wizard/tools_postgres.py rename to odoo_openupgrade_wizard/tools/tools_postgres.py index 83df631..944a67b 100644 --- a/odoo_openupgrade_wizard/tools_postgres.py +++ b/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): diff --git a/odoo_openupgrade_wizard/tools_system.py b/odoo_openupgrade_wizard/tools/tools_system.py similarity index 100% rename from odoo_openupgrade_wizard/tools_system.py rename to odoo_openupgrade_wizard/tools/tools_system.py diff --git a/tests/__init__.py b/tests/__init__.py index ac9fe29..217b466 100644 --- a/tests/__init__.py +++ b/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() diff --git a/tests/cli_03_docker_build_test.py b/tests/cli_03_docker_build_test.py index 791788b..7b70191 100644 --- a/tests/cli_03_docker_build_test.py +++ b/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 diff --git a/tests/cli_04_run_test.py b/tests/cli_04_run_test.py index e05fc01..3006d66 100644 --- a/tests/cli_04_run_test.py +++ b/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, diff --git a/tests/cli_05_execute_script_python_test.py b/tests/cli_05_execute_script_python_test.py index b5547b6..6060403 100644 --- a/tests/cli_05_execute_script_python_test.py +++ b/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, diff --git a/tests/cli_06_execute_script_sql_test.py b/tests/cli_06_execute_script_sql_test.py index 932b7a2..185e8f4 100644 --- a/tests/cli_06_execute_script_sql_test.py +++ b/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, ) diff --git a/tests/cli_07_upgrade_test.py b/tests/cli_07_upgrade_test.py index 837009c..37ee9b5 100644 --- a/tests/cli_07_upgrade_test.py +++ b/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, ) diff --git a/tests/cli_20_install_from_csv_test.py b/tests/cli_20_install_from_csv_test.py index 76d222c..222860c 100644 --- a/tests/cli_20_install_from_csv_test.py +++ b/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, ) diff --git a/tests/cli_21_generate_module_analysis_test.py b/tests/cli_21_generate_module_analysis_test.py index a20624f..99cc18c 100644 --- a/tests/cli_21_generate_module_analysis_test.py +++ b/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, From 0977781a3c716931995dfaa60bea36faf88209e4 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Mon, 27 Jun 2022 02:01:23 +0200 Subject: [PATCH 2/2] [FIX] set jinja2 as main library to install --- poetry.lock | 6 +++--- pyproject.toml | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index d283af6..d960af0 100644 --- a/poetry.lock +++ b/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 = [ diff --git a/pyproject.toml b/pyproject.toml index 1a05619..0054ddc 100644 --- a/pyproject.toml +++ b/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 = [