gOdoo-cli 0.12.9__tar.gz → 0.13.1__tar.gz

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: gOdoo-cli
-Version: 0.12.9
+Version: 0.13.1
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
-Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3
 Keywords: odoo,godoo,devcontainer
 Author: Joshua Kreuder
@@ -28,7 +27,8 @@ Requires-Dist: isort (>=5.10.1) ; extra == "codequality"
 Requires-Dist: mock (>=4.0.3) ; extra == "devcontainer"
 Requires-Dist: openupgradelib (>=3.3.4)
 Requires-Dist: passlib (>=1.7.3)
-Requires-Dist: psycopg2-binary (>=2.9.10,<3.0.0)
+Requires-Dist: pre-commit (>=3.4.0) ; extra == "codequality"
+Requires-Dist: psycopg2-binary (>=2.9.10)
 Requires-Dist: py-spy (>=0.3.11) ; extra == "devcontainer"
 Requires-Dist: pydevd-odoo (>=1.2.1) ; extra == "devcontainer"
 Requires-Dist: pylint-odoo (>=8.0.16) ; extra == "codequality"

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/pyproject.toml

@@ -1,72 +1,53 @@
-[tool.poetry]
+[build-system]
+requires = ["poetry-core>=2.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[project]
 name = "gOdoo-cli"
-version = "0.12.9"
+version = "0.13.1"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
-authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
+authors = [{name="Joshua Kreuder", email="Joshua_Kreuder@outlook.com"}]
 license = "LGPL-3"
 readme = "README.md"
 packages = [{include = "godoo_cli",  from = "src"}]
-repository = "https://github.com/OpenJKSoftware/gOdoo"
 keywords = ["odoo", "godoo","devcontainer"]
+requires-python = ">=3.9"
+urls=  {repository = "https://github.com/OpenJKSoftware/gOdoo"}
+scripts = {godoo = "godoo_cli:launch_cli"}
+dependencies = [
+    "python-dotenv>=0.20.0",
+    "ruamel-yaml>=0.17.21",
+    "gitpython>=3.1.27",
+    "godoo-rpc>=0.1.4",
+    "openupgradelib>=3.3.4",
+    "psycopg2-binary>=2.9.10",
+    "passlib>=1.7.3", # Mirror Odoo Reqs
+    "typer-common-functions>=0.0.12",
+    "typer>=0.9.0",
+]
 
-[tool.poetry.group.dev.dependencies]
-pre-commit = ">=3.4.0"
-
-[tool.poetry_bumpversion.file."src/godoo_cli/version.py"]
-
-[tool.poetry.scripts]
-godoo = "godoo_cli:launch_cli"
-
-[tool.poetry.dependencies]
-python = ">=3.9"
-python-dotenv = ">=0.20.0"
-ruamel-yaml = ">=0.17.21"
-gitpython = ">=3.1.27"
-godoo-rpc = ">=0.1.4"
-openupgradelib = ">=3.3.4"
-psycopg2-binary = "^2.9.10"
-passlib = ">=1.7.3" # Mirror Odoo Reqs
-typer-common-functions = ">=0.0.12"
-typer = ">=0.9.0"
-
-pylint-odoo = { version=">=8.0.16", optional = true}
-ipdb = { version=">=0.13.9", optional = true}
-debugpy = { version=">=1.6.0", optional = true}
-black = { version=">=22.10.0", optional = true}
-isort = { version=">=5.10.1", optional = true}
-watchdog = { version=">=2.1.7", optional = true}
-py-spy = { version=">=0.3.11", optional = true}
-rope = { version=">=0.23.0", optional = true}
-flake8 = { version=">=5.0.4", optional = true}
-inotify = { version=">=0.2.10",optional = true}
-mock = { version=">=4.0.3", optional= true}
-pytest = { version=">=7.2.1", optional= true}
-pytest-cov = {version=">=4.0.0",optional=true}
-pydevd-odoo = { version=">=1.2.1",optional=true}
-
-[tool.poetry.extras]
+[project.optional-dependencies]
 devcontainer = [
-    "ipdb",
-    "debugpy",
-    "watchdog",
-    "rope",
-    "py-spy",
-    "inotify",
-    "mock",
-    "pydevd-odoo"
+    "ipdb>=0.13.9",
+    "debugpy>=1.6.0",
+    "watchdog>=2.1.7",
+    "rope>=0.23.0",
+    "py-spy>=0.3.11",
+    "inotify>=0.2.10",
+    "mock>=4.0.3",
+    "pydevd-odoo>=1.2.1"
 ]
 codequality = [
-    "pylint-odoo",
-    "black",
-    "isort",
-    "flake8",
-    "pytest",
-    "pytest-cov"
+    "pylint-odoo>=8.0.16",
+    "black>=22.10.0",
+    "isort>=5.10.1",
+    "flake8>=5.0.4",
+    "pytest>=7.2.1",
+    "pytest-cov>=4.0.0",
+    "pre-commit>=3.4.0"
 ]
 
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+[tool.poetry_bumpversion.file."src/godoo_cli/version.py"]
 
 [tool.pytest.ini_options]
 log_cli = true

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/cli_common.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from pathlib import Path
-from typing import List, Optional
+from typing import List
 
 from typer import Argument, Option
 from typer_common_functions import get_type_from_default, typer_retuner, typer_unpacker
@@ -162,7 +162,7 @@ class SourceGetArgs:
         help="godoo manifest path, when downloading odoo source (skip repo_url)",
     )
 
-    source_download_archive: Optional[bool] = Option(
+    source_download_archive: bool = Option(
         False,
         "--source-download-archive",
         envvar="SOURCE_CLONE_ARCHIVE",

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/commands/db/connection.py

@@ -21,7 +21,9 @@ def login_db(
     db_password=CLI.database.db_password,
 ):
     """Login Interactive psql CLI using provided credentials"""
-    command = ["psql", f"-h{db_host}", f"-p{db_port}", f"-U{db_user}", f"-d{db_name}"]
+    command = ["psql", f"-h {db_host}", f"-U {db_user}", f"-d {db_name}"]
+    if db_port != 0:
+        command.append(f"-p {db_port}")
     subprocess.run(command, env={"PGPASSWORD": db_password})
 
 

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/commands/source_get.py

@@ -92,10 +92,11 @@ def update_odoo_conf_addon_paths(odoo_conf: Path, addon_paths: List[Path]):
         raise FileNotFoundError("Odoo.conf not found at: %s" % odoo_conf)
     config = configparser.ConfigParser()
     config.read(odoo_conf)
-    addon_paths = ",".join([str(p.absolute()) for p in addon_paths])
-    config["options"]["addons_path"] = addon_paths
+    path_strings = [str(p.absolute()) for p in addon_paths]
+    addon_path_option = ",".join(path_strings)
+    config["options"]["addons_path"] = addon_path_option
     LOGGER.info("Writing Addon Paths to Odoo Config.")
-    LOGGER.debug(addon_paths)
+    LOGGER.debug(addon_path_option)
     config.write(odoo_conf.open("w"))
 
 
@@ -179,7 +180,7 @@ def py_depends_by_modules(
     if len(module_list) == 1 and module_list[0] == "all":
         module_list = []
     module_reg = godooModules(odoo_addon_paths)
-    modules = module_reg.get_modules(module_list)
+    modules = list(module_reg.get_modules(module_list))
     _install_py_reqs_for_modules(modules, module_reg)
 
 
@@ -227,6 +228,7 @@ def get_source(
     add_compare_comments: bool = typer.Option(
         False, "--add-compare-comments", help="Wether to add github.com three dot compare links as comments."
     ),
+    pin_commits: bool = typer.Option(False, "--pin-commits", help="Pin commits in manifest to current commit in repo"),
     remove_unspecified_addons: bool = typer.Option(
         False, "--remove-unspecified-addons", help="Remove Addon folders that are not in YML or thirdparty.zip"
     ),
@@ -250,6 +252,7 @@ def get_source(
             force_fetch=force_fetch,
             add_compare_comment=add_compare_comments,
             download_archive=download_zipmode,
+            pin_commit=pin_commits,
         )
 
     if update_mode in ["all", "thirdparty"]:
@@ -258,6 +261,7 @@ def get_source(
             git_yml_path=manifest_path,
             generate_yml_compare_comments=add_compare_comments,
             download_archive=download_zipmode,
+            pin_commits=pin_commits,
         )
         if remove_unspecified_addons:
             remove_unused_folders(

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/git/git_odoo.py

@@ -13,6 +13,7 @@ def git_ensure_odoo_repo(
     force_fetch: bool,
     add_compare_comment: bool,
     download_archive: bool,
+    pin_commit: bool = False,
 ):
     yaml = yaml_roundtrip_loader()
     git_repos = yaml.load(manifest_file.resolve())
@@ -32,16 +33,18 @@ def git_ensure_odoo_repo(
     else:
         yaml_remove_compare_commit(odoo_data)
 
-    git_ensure_repo(
+    clone_ret = git_ensure_repo(
         target_folder=target_folder,
         repo_src=odoo_url,
         branch=odoo_branch,
         commit=odoo_commit,
-        pull=force_fetch,
+        pull=odoo_commit or odoo_branch if force_fetch else "",
         zip_mode=download_archive,
         filter="blob:none",
         single_branch=True,
     )
+    if pin_commit and clone_ret:
+        odoo_data["commit"] = clone_ret.head.commit.hexsha
 
     # make sure odoo-bin is executable
     odoo_bin = target_folder / "odoo-bin"

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/git/git_odoo_addons.py

@@ -1,9 +1,9 @@
 import concurrent.futures
 import logging
 from pathlib import Path
-from typing import Dict
+from typing import Dict, List
 
-from git import Commit
+from git import Repo
 
 from ..helpers.odoo_manifest import update_yml, yaml_roundtrip_loader
 from .git_repo import git_ensure_repo
@@ -17,6 +17,7 @@ def git_ensure_addon_repos(
     git_yml_path: Path,
     generate_yml_compare_comments: bool = False,
     download_archive: bool = False,
+    pin_commits: bool = False,
 ):
     """
     Clone repos specified in Yml.
@@ -31,11 +32,15 @@ def git_ensure_addon_repos(
         wether to add three dot compare on remote to repo urls
     download_archive : bool, optional
         wether to download as .zip (fast but no history), by default False
+    pin_commits : bool, optional
+        pin commits in yml, by default False
     """
     yaml = yaml_roundtrip_loader()
     git_repos = yaml.load(git_yml_path.resolve())
-    if _git_clone_addon_repos(root_folder=root_folder, git_repos=git_repos, download_archive=download_archive):
-        update_yml(git_repos, generate_yml_compare_comments)
+    if result := _git_clone_addon_repos(
+        root_folder=root_folder, git_repos=git_repos, download_archive=download_archive
+    ):
+        update_yml(git_repos, result, generate_yml_compare_comments, pin_commits)
         LOGGER.info("Updating Git Thirdparty Repo Commit hashes")
         yaml.dump(git_repos, git_yml_path)
 
@@ -46,7 +51,7 @@ def _git_clone_addon_repos(
     root_folder: Path,
     git_repos: Dict[str, Dict[str, str]],
     download_archive: bool = False,
-) -> Dict[str, Commit]:
+) -> Dict[str, Repo]:
     """
     Clones Git repos specified in dict into Root folder.
     Ensures repo names are prefixed and uses 8 threads to clone.
@@ -66,30 +71,33 @@ def _git_clone_addon_repos(
     Dict[str:Commit]
         dict of {git_src_url:HeadCommit}
     """
-    default_branch = git_repos["odoo"].get("branch")
+    default_branch = git_repos["odoo"].get("branch", "master")
     LOGGER.info("Cloning Thirdparty Addons source.")
     with concurrent.futures.ThreadPoolExecutor(8) as executor:
         futures = []
-        thirdparty_repos = git_repos.get("thirdparty")
+        thirdparty_repos: Dict[str, List[Dict[str, str]]] = git_repos.get("thirdparty")  # type: ignore
         if not thirdparty_repos:
             LOGGER.info("No Thirdparty Key in manifest. Skipping...")
-            return
+            return {}
         for prefix, repos in thirdparty_repos.items():
             for repo in repos:
-                repo_url = GitUrl(repo["url"])
+                url = repo["url"]
+                repo_url = GitUrl(url)
                 name = f"{prefix}_{repo_url.name}"
                 futures.append(
-                    executor.submit(
-                        git_ensure_repo,
-                        target_folder=Path(root_folder / name),
-                        repo_src=repo_url.url,
-                        branch=repo.get("branch", default_branch),
-                        commit=repo.get("commit"),
-                        zip_mode=download_archive,
-                        filter="blob:none",
-                        single_branch=True,
+                    (
+                        url,
+                        executor.submit(
+                            git_ensure_repo,
+                            target_folder=Path(root_folder / name),
+                            repo_src=repo_url.url,
+                            branch=repo.get("branch", default_branch),
+                            commit=repo.get("commit"),  # type: ignore
+                            zip_mode=download_archive,
+                            filter="blob:none",
+                            single_branch=True,
+                        ),
                     )
                 )
-        clone_results = [f.result() for f in futures]
-        clone_results = {r[0]: r[1] for r in clone_results if r}
+        clone_results: Dict[str, Repo] = {r: f.result() for r, f in futures if r}
     return clone_results

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/git/git_repo.py

@@ -148,7 +148,7 @@ def git_ensure_ref(
             repo.active_branch.name if not repo.head.is_detached else "Detached",
             repo.head.commit,
         )
-    return repo_src, repo.head.commit
+    return repo
 
 
 def git_ensure_repo(

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/helpers/modules.py

@@ -26,7 +26,7 @@ class godooModule:
             raise NotAValidModuleError(f"{self.path} is not a valid odoo module")
 
     def __repr__(self) -> str:
-        return f"godooModule({str(self.path.absolute())})"
+        return f"godooModule({str(self.path.name)})"
 
     def __eq__(self, __value: object) -> bool:
         if isinstance(__value, godooModule):
@@ -50,7 +50,8 @@ class godooModule:
 
     @property
     def py_depends(self) -> List[str]:
-        return self.manifest.get("external_dependencies", {}).get("python", [])
+        module_depends = self.manifest.get("external_dependencies", {}).get("python", [])
+        return module_depends
 
     @property
     def odoo_depends(self) -> List[str]:

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/helpers/modules_py.py

@@ -24,7 +24,7 @@ def _install_py_reqs_for_modules(modules: List[godooModule], module_reg: godooMo
     -------
     CompletedProcess
     """
-    reqs = []
+    reqs: list[str] = []
     if isinstance(modules, GeneratorType):
         modules = list(modules)
     all_modules = modules + module_reg.get_module_dependencies(modules)
@@ -32,7 +32,7 @@ def _install_py_reqs_for_modules(modules: List[godooModule], module_reg: godooMo
     for mod in all_modules:
         reqs += mod.py_depends
     if reqs:
-        return pip_install(set(reqs))
+        return pip_install(list(set(reqs)))
 
 
 def _install_py_reqs_by_odoo_cmd(addon_paths: List[Path], odoo_bin_cmd: str):
@@ -56,4 +56,5 @@ def _install_py_reqs_by_odoo_cmd(addon_paths: List[Path], odoo_bin_cmd: str):
         LOGGER.debug("Found Modules to install in odoo-bin command: %s", install_modules)
         module_reg = godooModules(addon_paths)
         modules = [module_reg.get_module(m) for m in install_modules]
+        modules = [m for m in modules if m]
         return _install_py_reqs_for_modules(modules, module_reg)

{godoo_cli-0.12.9 → godoo_cli-0.13.1}/src/godoo_cli/helpers/odoo_manifest.py

@@ -3,6 +3,7 @@ import shutil
 from pathlib import Path
 from typing import List
 
+from git import Repo
 from ruamel.yaml import YAML
 
 from ..git.git_url import GitUrl
@@ -36,7 +37,9 @@ def remove_unused_folders(thirdparty_addon_path: Path, thirdparty_repos, keep_fo
 
 def update_yml(
     repo_yml,
+    clone_results: dict[str, Repo],
     generate_yml_compare_comments: bool = False,
+    generate_yml_commit_pins: bool = False,
 ):
     """Process yaml after thirdparty clone.
 
@@ -44,8 +47,12 @@ def update_yml(
     ----------
     repo_yml : Yaml Dict
         Ruamel Yaml Dict of prefix and list of repos (url,commit,branch)
+    clone_results: dict[str,Commit]
+        Git url to currently cloned commit. Gets returned from Git Downloader
     generate_yml_compare_comments : bool, optional
         add github compare links as comment to repo yml, by default False
+    generate_yml_commit_pins: bool, optional
+        adds commit pins to currently checked out head commit
     """
     thirdparty_repos = repo_yml["thirdparty"]
     odoo_default_branch = repo_yml["odoo"].get("branch")
@@ -55,6 +62,8 @@ def update_yml(
 
     for prefix in thirdparty_repos:
         for repo in thirdparty_repos[prefix]:
+            if generate_yml_commit_pins and (c := clone_results.get(repo.get("url"))):
+                repo["commit"] = c.head.commit.hexsha
             if generate_yml_compare_comments:
                 yaml_add_compare_commit(repo, odoo_default_branch)
             else:

godoo_cli-0.13.1/src/godoo_cli/version.py

@@ -0,0 +1 @@
+__version__ = "0.13.1"

godoo_cli-0.12.9/src/godoo_cli/version.py

@@ -1 +0,0 @@
-__version__ = "0.12.9"