gOdoo-cli 0.5.1__tar.gz → 0.6.0__tar.gz

{godoo_cli-0.5.1 → godoo_cli-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: godoo-cli
-Version: 0.5.1
+Version: 0.6.0
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3
@@ -29,6 +29,7 @@ Requires-Dist: passlib (>=1.7.3,<2.0.0)
 Requires-Dist: pre-commit (>=2.20.0,<3.0.0) ; extra == "devcontainer"
 Requires-Dist: psycopg2 (>=2.8.6,<3.0.0)
 Requires-Dist: py-spy (>=0.3.11,<0.4.0) ; extra == "devcontainer"
+Requires-Dist: pydevd-odoo (>=1.2.1,<2.0.0) ; extra == "devcontainer"
 Requires-Dist: pylint-odoo (>=8.0.16,<9.0.0) ; extra == "codequality"
 Requires-Dist: pytest (>=7.2.1,<8.0.0) ; extra == "codequality"
 Requires-Dist: pytest-cov (>=4.0.0,<5.0.0) ; extra == "codequality"
@@ -161,7 +162,7 @@ There are 3 Options to reset the Dev Env.
    container. (Vscode will prompt to reconnect if still open)
 2. From **Outside** the Container run `make reset-hard` in the project root to force rebuild the main Odoo container and
    then do the same as `make reset`
-3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and the bootstrap flag, which is way
+3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and config file, which is way
    quicker than the other options.
 
 ### Manual Reset

{godoo_cli-0.5.1 → godoo_cli-0.6.0}/README.md

@@ -119,7 +119,7 @@ There are 3 Options to reset the Dev Env.
    container. (Vscode will prompt to reconnect if still open)
 2. From **Outside** the Container run `make reset-hard` in the project root to force rebuild the main Odoo container and
    then do the same as `make reset`
-3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and the bootstrap flag, which is way
+3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and config file, which is way
    quicker than the other options.
 
 ### Manual Reset

{godoo_cli-0.5.1 → godoo_cli-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.5.1"
+version = "0.6.0"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"
@@ -39,6 +39,7 @@ 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]
 devcontainer = [
@@ -50,6 +51,7 @@ devcontainer = [
     "py-spy",
     "inotify",
     "mock",
+    "pydevd-odoo"
 ]
 codequality = [
     "pylint-odoo",

{godoo_cli-0.5.1 → godoo_cli-0.6.0}/src/godoo_cli/cli_common.py

@@ -73,13 +73,6 @@ class OdooPathCLIArgs:
         rich_help_panel="Path Options",
     )
 
-    bootstrap_flag_location: Path = Option(
-        ...,
-        envvar="ODOO_BOOTSTRAP_FLAG",
-        help="Location of the Bootstrap indicator file",
-        rich_help_panel="Path Options",
-    )
-
 
 @dataclass
 class RpcCLIArgs:

{godoo_cli-0.5.1 → godoo_cli-0.6.0}/src/godoo_cli/commands/bootstrap.py

@@ -139,7 +139,6 @@ def bootstrap_odoo(
     workspace_addon_path=CLI.odoo_paths.workspace_addon_path,
     thirdparty_addon_path=CLI.odoo_paths.thirdparty_addon_path,
     odoo_conf_path=CLI.odoo_paths.conf_path,
-    bootstrap_flag_location=CLI.odoo_paths.bootstrap_flag_location,
     db_filter=CLI.database.db_filter,
     db_host=CLI.database.db_host,
     db_port=CLI.database.db_port,
@@ -183,8 +182,6 @@ def bootstrap_odoo(
 
     LOGGER.info("Launching Bootstrap Commandline")
     ret = run_cmd(cmd_string).returncode
-    if ret == 0:
-        bootstrap_flag_location.touch()
-    else:
+    if ret != 0:
         LOGGER.error("Odoo-Bin Returned %d", ret)
     return CLI.returner(ret)

{godoo_cli-0.5.1 → godoo_cli-0.6.0}/src/godoo_cli/commands/launch.py

@@ -56,7 +56,6 @@ def _launch_command(
 def pre_launch(
     odoo_main_path: Path,
     workspace_addon_path: Path,
-    bootstrap_flag_location: Path,
     thirdparty_addon_path: Path,
     odoo_conf_path: Path,
     db_filter: str,
@@ -75,7 +74,7 @@ def pre_launch(
     install_base: bool = True,
     launch_or_bootstrap: bool = False,
 ):
-    """Start Bootstrap if no bootstrap flag is found. And return Launch CMD.
+    """Start Bootstrap if no config file is found. And return Launch CMD.
 
     Parameters
     ----------
@@ -83,8 +82,6 @@ def pre_launch(
         Path to Odoo-bin folder
     workspace_addon_path : Path
         Path to workspace addons
-    bootstrap_flag_location : Path
-        path to bootstrap flag
     thirdparty_addon_path : Path
         path to thirdparty addons folder
     odoo_conf_path : Path
@@ -132,7 +129,7 @@ def pre_launch(
         log_file_path.unlink(missing_ok=True)
         extra_odoo_args.append("--logfile " + str(log_file_path.absolute()))
 
-    bootstraped = bootstrap_flag_location.exists()
+    bootstraped = odoo_conf_path.exists()
     LOGGER.info("Bootstrap Flag Status: %s", bootstraped)
     ret = ""
     if not bootstraped:
@@ -150,7 +147,6 @@ def pre_launch(
             db_password=db_password,
             db_host=db_host,
             db_port=db_port,
-            bootstrap_flag_location=bootstrap_flag_location,
             thirdparty_addon_path=thirdparty_addon_path,
             odoo_main_path=odoo_main_path,
             odoo_conf_path=odoo_conf_path,
@@ -193,7 +189,6 @@ def pre_launch(
 def launch_odoo(
     odoo_main_path=CLI.odoo_paths.bin_path,
     workspace_addon_path=CLI.odoo_paths.workspace_addon_path,
-    bootstrap_flag_location=CLI.odoo_paths.bootstrap_flag_location,
     thirdparty_addon_path=CLI.odoo_paths.thirdparty_addon_path,
     odoo_conf_path=CLI.odoo_paths.conf_path,
     db_filter=CLI.database.db_filter,
@@ -218,7 +213,6 @@ def launch_odoo(
     launch_cmd = pre_launch(
         odoo_main_path=odoo_main_path,
         workspace_addon_path=workspace_addon_path,
-        bootstrap_flag_location=bootstrap_flag_location,
         thirdparty_addon_path=thirdparty_addon_path,
         odoo_conf_path=odoo_conf_path,
         db_filter=db_filter,
@@ -253,7 +247,6 @@ def launch_import(
     ),
     odoo_main_path=CLI.odoo_paths.bin_path,
     workspace_addon_path=CLI.odoo_paths.workspace_addon_path,
-    bootstrap_flag_location=CLI.odoo_paths.bootstrap_flag_location,
     thirdparty_addon_path=CLI.odoo_paths.thirdparty_addon_path,
     odoo_conf_path=CLI.odoo_paths.conf_path,
     db_filter=CLI.database.db_filter,
@@ -279,7 +272,6 @@ def launch_import(
     launch_cmd = pre_launch(
         odoo_main_path=odoo_main_path,
         workspace_addon_path=workspace_addon_path,
-        bootstrap_flag_location=bootstrap_flag_location,
         thirdparty_addon_path=thirdparty_addon_path,
         odoo_conf_path=odoo_conf_path,
         db_filter=db_filter,

{godoo_cli-0.5.1 → godoo_cli-0.6.0}/src/godoo_cli/commands/test.py

@@ -46,7 +46,6 @@ def odoo_test(
     ),
     odoo_main_path=CLI.odoo_paths.bin_path,
     workspace_addon_path=CLI.odoo_paths.workspace_addon_path,
-    bootstrap_flag_location=CLI.odoo_paths.bootstrap_flag_location,
     thirdparty_addon_path=CLI.odoo_paths.thirdparty_addon_path,
     odoo_conf_path=CLI.odoo_paths.conf_path,
     db_filter=CLI.database.db_filter,
@@ -101,7 +100,6 @@ def odoo_test(
         workspace_addon_path=workspace_addon_path,
         thirdparty_addon_path=thirdparty_addon_path,
         odoo_conf_path=odoo_conf_path,
-        bootstrap_flag_location=bootstrap_flag_location,
         db_filter=db_filter,
         db_host=db_host,
         db_port=db_port,

godoo_cli-0.6.0/src/godoo_cli/git/git_odoo.py

@@ -0,0 +1,89 @@
+import json
+import logging
+from pathlib import Path
+
+from ..helpers.odoo_manifest import yaml_add_compare_commit, yaml_remove_compare_commit, yaml_roundtrip_loader
+from .git_repo import git_ensure_repo
+
+LOGGER = logging.getLogger(__name__)
+
+
+def git_ensure_odoo_repo(
+    target_folder: Path,
+    manifest_file: Path,
+    force_fetch: bool,
+    add_compare_comment: bool,
+    download_archive: bool,
+):
+    yaml = yaml_roundtrip_loader()
+    git_repos = yaml.load(manifest_file.resolve())
+    if not git_repos:
+        raise FileNotFoundError(f"Couldnt load yml file from: {str(manifest_file)}")
+
+    odoo_data = git_repos.get("odoo")
+    if not odoo_data:
+        raise KeyError(f"Could not find key 'odoo' in {str(manifest_file)}")
+
+    odoo_url = odoo_data["url"]
+    odoo_branch = odoo_data.get("branch", "master")
+    odoo_commit = odoo_data.get("commit", "")
+
+    download_stubs(target_folder, force_fetch, download_archive, odoo_data, odoo_branch)
+
+    if add_compare_comment:
+        yaml_add_compare_commit(odoo_data, odoo_branch)
+    else:
+        yaml_remove_compare_commit(odoo_data)
+
+    git_ensure_repo(
+        target_folder=target_folder,
+        repo_src=odoo_url,
+        branch=odoo_branch,
+        commit=odoo_commit,
+        pull=force_fetch,
+        zip_mode=download_archive,
+        filter="blob:none",
+        single_branch=True,
+    )
+
+    yaml.dump(git_repos, manifest_file)
+
+
+def download_stubs(
+    target_folder: Path,
+    force_fetch: bool,
+    download_archive: bool,
+    odoo_data,
+    odoo_branch: str,
+):
+    """Download Odoo stubs for https://github.com/odoo-ide/vscode-odoo
+
+    Hopefully this Method will become obsolete in the future, when the vscode-odoo extension includes stubs in the extension itself.
+
+    Parameters
+    ----------
+    target_folder : Path
+        Stubs will be downloaded to target_folder.parent/odoo-stubs
+    force_fetch : bool
+        passed down to git_ensure_repo
+    download_archive : bool
+        passed down to git_ensure_repo
+    odoo_data : Dict
+        odoo_data from manifest.yml
+    odoo_branch : str
+        branch to download stubs from
+    """
+    odoo_stubs = odoo_data.get("stubs")
+    if odoo_stubs:
+        stub_target_path = target_folder.parent / "odoo-stubs"
+        git_ensure_repo(
+            target_folder=stub_target_path,
+            repo_src=odoo_stubs["url"],
+            branch=odoo_branch,
+            pull=force_fetch,
+            zip_mode=download_archive,
+            filter="blob:none",
+            single_branch=True,
+        )
+        if pyright_path := odoo_stubs.get("pyright_conf"):
+            json.dump({"stubPath": str(stub_target_path.absolute())}, Path(pyright_path).open("w"))

godoo_cli-0.6.0/src/godoo_cli/version.py

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

godoo_cli-0.5.1/src/godoo_cli/git/git_odoo.py

@@ -1,45 +0,0 @@
-import logging
-from pathlib import Path
-
-from ..helpers.odoo_manifest import yaml_add_compare_commit, yaml_remove_compare_commit, yaml_roundtrip_loader
-from .git_repo import git_ensure_repo
-
-LOGGER = logging.getLogger(__name__)
-
-
-def git_ensure_odoo_repo(
-    target_folder: Path,
-    manifest_file: Path,
-    force_fetch: bool,
-    add_compare_comment: bool,
-    download_archive: bool,
-):
-    yaml = yaml_roundtrip_loader()
-    git_repos = yaml.load(manifest_file.resolve())
-    if not git_repos:
-        raise FileNotFoundError(f"Couldnt load yml file from: {str(manifest_file)}")
-
-    odoo_data = git_repos.get("odoo")
-    if not odoo_data:
-        raise KeyError(f"Could not find key 'odoo' in {str(manifest_file)}")
-
-    odoo_url = odoo_data["url"]
-    odoo_branch = odoo_data.get("branch", "master")
-    odoo_commit = odoo_data.get("commit", "")
-    if add_compare_comment:
-        yaml_add_compare_commit(odoo_data, odoo_branch)
-    else:
-        yaml_remove_compare_commit(odoo_data)
-
-    git_ensure_repo(
-        target_folder=target_folder,
-        repo_src=odoo_url,
-        branch=odoo_branch,
-        commit=odoo_commit,
-        pull=force_fetch,
-        zip_mode=download_archive,
-        filter="blob:none",
-        single_branch=True,
-    )
-
-    yaml.dump(git_repos, manifest_file)

godoo_cli-0.5.1/src/godoo_cli/version.py

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