gOdoo-cli 0.11.3__tar.gz → 0.11.6__tar.gz

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gOdoo-cli
-Version: 0.11.3
+Version: 0.11.6
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.11.3"
+version = "0.11.6"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/commands/db/connection.py

@@ -69,6 +69,8 @@ class DBConnection:
         cr = connection.cursor()
         try:
             yield cr
+            LOGGER.debug("Committing DB cursor")
+            connection.commit()
         except Exception as e:
             LOGGER.warning("Rolling Back DB cursor. Got Exception: %s", e)
             connection.rollback()

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/commands/db/passwords.py

@@ -48,10 +48,9 @@ def set_passwords(
         db_name=db_name,
     )
     hashed_pw = _hash_odoo_password(new_password)
-    with connection.connect() as conn:
+    with connection.connect() as cur:
         try:
-            conn.execute(f"UPDATE res_users SET password='{hashed_pw}'")
-            conn.commit()
+            cur.execute(f"UPDATE res_users SET password='{hashed_pw}'")
         except Exception:
             raise typer.Exit(1)
     LOGGER.info("Password for all users set to: '%s'", new_password)

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/commands/db/query.py

@@ -64,8 +64,6 @@ def query_database(
             except ProgrammingError:
                 # When there is nothing to fetch, fetchall() raises a ProgrammingError
                 pass
-            cursor.commit()
-
         except Exception as e:
             LOGGER.exception(e)
             raise typer.Exit(1)

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/commands/rpc/translations.py

@@ -105,7 +105,7 @@ def dump_translations(
     upgrade_modules: bool = typer.Option(True, help="Upgrade modules before exporting"),
 ):
     """Dump Translations of module to <module_folder>/i18n/<module_name>.pot"""
-    godoo_modules = godooModules(workspace_addon_path).get_modules(modules)
+    godoo_modules = list(godooModules(workspace_addon_path).get_modules(modules))
     module_names = [m.name for m in godoo_modules]
     LOGGER.debug("Found modules: %s", module_names)
 

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/commands/source_get.py

@@ -125,7 +125,7 @@ def py_depends_by_db(
     )
     module_list = [m for m in module_list]
     module_reg = godooModules(odoo_addon_paths)
-    modules = list(module_reg.get_modules(module_list))
+    modules = list(module_reg.get_modules(module_list, raise_missing_names=False))
     _install_py_reqs_for_modules(modules, module_reg)
 
 
@@ -178,7 +178,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 = godooModules.get_modules(module_list)
+    modules = module_reg.get_modules(module_list)
     _install_py_reqs_for_modules(modules, module_reg)
 
 

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/git/git_odoo.py

@@ -43,4 +43,12 @@ def git_ensure_odoo_repo(
         single_branch=True,
     )
 
+    # make sure odoo-bin is executable
+    odoo_bin = target_folder / "odoo-bin"
+    if odoo_bin.exists():
+        LOGGER.debug("chmod odoo-bin +executable")
+        odoo_bin.chmod(0o755)
+    else:
+        LOGGER.warning("Could not find odoo-bin in %s", target_folder)
+
     yaml.dump(git_repos, manifest_file)

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/git/git_repo.py

@@ -1,4 +1,5 @@
 """ Module to provide GIT interaction."""
+
 import logging
 import shutil
 from pathlib import Path
@@ -64,7 +65,7 @@ def git_pull_checkout_reset(
     if pull:
         LOGGER.debug("Pulling Repo: %s, %s", repo.working_dir, pull)
         try:
-            repo.remotes[0].pull(pull)
+            repo.remotes[0].pull(None if isinstance(pull, bool) else pull)
         except GitCommandError as e:
             if "fatal: refusing to merge unrelated histories" in e.stderr:
                 clone_kwargs = {}

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/helpers/modules.py

@@ -62,11 +62,18 @@ class godooModules:
         self.addon_paths = addon_paths
         self.godoo_modules: Dict[str, godooModule] = {}
 
-    def get_modules(self, module_names: Optional[List[str]] = None) -> Generator[godooModule, None, None]:
+    def get_modules(
+        self, module_names: Optional[List[str]] = None, raise_missing_names=True
+    ) -> Generator[godooModule, None, None]:
         """Get all Modules in Addon Paths or only the ones specified in module_names"""
         if module_names:
             for name in module_names:
-                yield self.get_module(name)
+                try:
+                    yield self.get_module(name)
+                except ModuleNotFoundError as e:
+                    if raise_missing_names:
+                        raise e
+                    LOGGER.debug(e.msg)
         else:
             yield from self._get_modules()
 
@@ -112,7 +119,7 @@ class godooModules:
             deps = [d for d in deps if d not in dont_follow]
         if deps:
             dont_follow = (dont_follow or []) + deps
-            dep_modules = list(self.get_modules(deps))
+            dep_modules = list(self.get_modules(deps, raise_missing_names=False))
             sub_dep_modules = []
             for dep in dep_modules:
                 sub_dep_modules += self.get_module_dependencies(dep, dont_follow)

{godoo_cli-0.11.3 → godoo_cli-0.11.6}/src/godoo_cli/helpers/modules_py.py

@@ -1,6 +1,7 @@
 import logging
 import re
 from pathlib import Path
+from types import GeneratorType
 from typing import List
 
 from .modules import godooModule, godooModules
@@ -24,6 +25,8 @@ def _install_py_reqs_for_modules(modules: List[godooModule], module_reg: godooMo
     CompletedProcess
     """
     reqs = []
+    if isinstance(modules, GeneratorType):
+        modules = list(modules)
     all_modules = modules + module_reg.get_module_dependencies(modules)
     all_modules = list(set(all_modules))
     for mod in all_modules:

godoo_cli-0.11.6/src/godoo_cli/version.py

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

godoo_cli-0.11.3/src/godoo_cli/version.py

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