gOdoo-cli 0.1.4__tar.gz → 0.1.5__tar.gz

{godoo_cli-0.1.4 → godoo_cli-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: godoo-cli
-Version: 0.1.4
+Version: 0.1.5
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3
@@ -127,7 +127,6 @@ docker-compose up
    - You can enable godoo tab-completion by `godoo --install-completion`
    - `make` -> Loads Odoo + Workspace Addons
    - `make bare` -> Loads Odoo with ony `web` installed.
-   - `make enterprise` -> godoo launch with `-i web_enterprise` parameter
    - `make kill` -> Search for `odoo-bin` processes and kill them
    - `make reset` -> Drops DB, deletes config file and datafolder
    - The full init script is available via "`godoo`". (See --help for Options)

{godoo_cli-0.1.4 → godoo_cli-0.1.5}/README.md

@@ -90,7 +90,6 @@ docker-compose up
    - You can enable godoo tab-completion by `godoo --install-completion`
    - `make` -> Loads Odoo + Workspace Addons
    - `make bare` -> Loads Odoo with ony `web` installed.
-   - `make enterprise` -> godoo launch with `-i web_enterprise` parameter
    - `make kill` -> Search for `odoo-bin` processes and kill them
    - `make reset` -> Drops DB, deletes config file and datafolder
    - The full init script is available via "`godoo`". (See --help for Options)

{godoo_cli-0.1.4 → godoo_cli-0.1.5}/pyproject.toml

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

{godoo_cli-0.1.4 → godoo_cli-0.1.5}/setup.py

@@ -40,9 +40,9 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'godoo-cli',
-    'version': '0.1.4',
+    'version': '0.1.5',
     'description': 'Wrapper around Odoo-Bin with some convinience RPC functions.',
-    'long_description': '# gOdoo Dev Environment\n\n![OdooLogo](https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/odoo_logo.png)\n![ComposeLogo](https://raw.githubusercontent.com/docker/compose/v2/logo.png)\n\n[<img src="https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/godoo-main-cli.png" width="1000"/>](image.png)\n\n**gOdoo** is short for **go Odoo**. \\\nIt is a [Vscode Devcontainer](https://code.visualstudio.com/docs/remote/containers) Environment for [Odoo](https://odoo.com/)\nwith Python CLI `godoo` convenience wrapper around `odoo-bin`.\n\nThis repository is the base source for the Python package [godoo-cli](https://pypi.org/project/godoo-cli/) and serves as\nan all batteries included development environment.\n\nMade Possible by: [WEMPE Elektronic GmbH](https://wetech.de)\n\n# gOdoo-cli\n\nPython package that provides `godoo` command line interface around `odoo-bin`.\n\nIt\'s build with [Typer](https://github.com/tiangolo/typer) to provide some convenience Wrappers for Odoo development and\nDeployment.\n\nMost flags can be configured by Env variables. \\\nUse `godoo --help` to find out more. HINT: Install tab-completion with `godoo --install-completion`\n\n# Docker\n\nThis workspace also contains Docker and Docker-Compose files. \\\n\nThey are used to provide either easy Odoo instances where the source is pulled according to\n[ODOO_MANIFEST.yml](./ODOO_MANIFEST.yml), or as a all batteries included devcontainer for VScode.\n\n## Requirements\n\n- [Docker Compose](https://github.com/docker/compose)\n- [Traefik](https://doc.traefik.io/traefik/) container running with docker provider and "traefik" named docker network.\n  Example: [Traefik Devproxy](https://github.com/joshkreud/traefik_devproxy)\n- SSH Agent running. (check `echo $SSH_AUTH_SOCK`)\\\n  This gets passed trough in the Buildprocess to clone Thirdparty repos.\n\n## Just wanna have a quick and easy Odoo Instance?\n\n```bash\ngit clone https://github.com/OpenJKSoftware/gOdoo\ncd godoo\n. scripts/container_requirements.sh # Check Requirements\ndocker-compose build\ndocker-compose up\n# wait......\n# wait a bit mode ...\n# just a little bit longer ..\n# There we go.\n# Odoo should be reachable on \'https://godoo.docker.localhost\' assuming you didn\'t change .env TRAEFIK_HOST_RULE or COMPOSE_PROJECT_NAME\n```\n\n# Devcontainer\n\n## Features\n\n- All batteries included [Devcontainer](https://code.visualstudio.com/docs/remote/containers) with postgres service\n  Container and local DNS resolvig managed by [Traefik](https://doc.traefik.io/traefik/).\n- Easy fully working Odoo instance by `docker-compose up` with https access.\n- `godoo` CLI wrapper around Odoo. (Most flags can be configured by Environment Variables and are already preconfigured\n  in the Containers. See [.env.sample](./.env.sample))\n- `odoo-bin` is added to PATH and can thus be invoked from every folder.\n- Odoo will run in Proxy_Mode behind a Traefik reverse proxy for easy access on\n  `https://$COMPOSE_PROJECT_NAME.docker.localhost`\n- [Odoo Pylint plugin](https://github.com/OCA/pylint-odoo) preconfigured in vscode\n- Preinstalled vscode Extensions Highlights:\n  - [SQL Tools](https://marketplace.visualstudio.com/items?itemName=mtxr.sqltools) with preconfigured connection for\n    easy Database access in the Sidebar.\n  - [Docker Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) controls\n    container host.\n  - [Odoo Snippets](https://marketplace.visualstudio.com/items?itemName=mstuttgart.odoo-snippets)\n  - [Odoo Developments](https://marketplace.visualstudio.com/items?itemName=scapigliato.vsc-odoo-development) can Grab\n    Odoo Model information from a running Server\n  - [Todo Tree](https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.todo-tree)\n\n## Usage\n\n1. For Docker on windows: Clone the repo into the WSL2 Filesystem for better IO performance\n2. Have [Traefik](https://github.com/traefik/traefik) Running on `docker.localhost`\n   [Example](https://github.com/joshkreud/traefik_devproxy) \\\n   There must be a Docker network called `traefik` that can reach traefik.\n3. Open Devcontianer:\n   - If you have the Devcontainer CLI: `devcontainer open .`\n   - If not open the workspace in Local Vscode. In the Command pallete search for `Reopen in container`\n4. From **within the container** start Odoo using one of the following commands:\n   - You can enable godoo tab-completion by `godoo --install-completion`\n   - `make` -> Loads Odoo + Workspace Addons\n   - `make bare` -> Loads Odoo with ony `web` installed.\n   - `make enterprise` -> godoo launch with `-i web_enterprise` parameter\n   - `make kill` -> Search for `odoo-bin` processes and kill them\n   - `make reset` -> Drops DB, deletes config file and datafolder\n   - The full init script is available via "`godoo`". (See --help for Options)\n5. Open Odoo `https://$COMPOSE_PROJECT_NAME.docker.localhost`\\\n   For example `COMPOSE_PROJECT_NAME=godoo` --> [https://godoo.docker.localhost](https://godoo.docker.localhost)\n6. Login with `admin:admin`\n7. Profit!\n\n### Access to Odoo and Thirdparty addon Source\n\nYou can access the Odoo source by opening the VsCode workspace [full.code-workspace](full.code-workspace) from within\nthe Container. This will open a [Multi-Root Workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces).\nReally waiting for https://github.com/microsoft/vscode-remote-release/issues/3665 here.\n\n## Reset Devcontainer Data\n\nWhen you screwed up so bad its time to just start Over godoo has you covered:\n\n### Automatic Reset\n\nThere are 3 Options to reset the Dev Env.\n\n1. From **Outside** the Container run `make reset` in the project root to delete docker volumes and restart the\n   container. (Vscode will prompt to reconnect if still open)\n2. From **Outside** the Container run `make reset-hard` in the project root to force rebuild the main Odoo container and\n   then do the same as `make reset`\n3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and the bootstrap flag, which is way\n   quicker than the other options.\n\n### Manual Reset\n\n1. Close vscode\n2. Remove `app` and `db` container from docker.\n3. Remove volumes: `db, odoo_thirdparty, odoo_web, vscode_extensions`\n4. Restart Devcontainer\n\n## Python Debugging\n\n### VsCode Debugging\n\nDebugging doesn\'t reliably work with\n[Odoo Multiprocess](https://www.odoo.com/documentation/14.0/developer/misc/other/cmdline.html#multiprocessing) mode\nenabled. \\\nThe container ships with a Vscode Debug profile, that sets `--workers 0` to allow for Debugging Breakpoints. See [.vscode/launch.json](./.vscode/launch.json)\n\n### Interactive Shell\n\nUse `godoo shell` to enter an interactive shell on the Database.\n\n# Odoo Modules\n\n## Third Party Modules (manifest.yml)\n\nThe `godoo` bootstrap function, will download some modules using git. \\\nWhich Repos to download is specified in `ODOO_MANIFEST.yml` ([Default](./ODOO_MANIFEST.yml)) \\\nNot all of the cloned addons are automatically installed. \\\nInstall them via the Apps Page in Odoo using `godoo rpc modules install` or using `odoo-bin`.\\\nModules downloaded on the Odoo Marketplace can be dropped as a `.zip` archive in [./thirdparty](./thirdparty)\n',
+    'long_description': '# gOdoo Dev Environment\n\n![OdooLogo](https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/odoo_logo.png)\n![ComposeLogo](https://raw.githubusercontent.com/docker/compose/v2/logo.png)\n\n[<img src="https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/godoo-main-cli.png" width="1000"/>](image.png)\n\n**gOdoo** is short for **go Odoo**. \\\nIt is a [Vscode Devcontainer](https://code.visualstudio.com/docs/remote/containers) Environment for [Odoo](https://odoo.com/)\nwith Python CLI `godoo` convenience wrapper around `odoo-bin`.\n\nThis repository is the base source for the Python package [godoo-cli](https://pypi.org/project/godoo-cli/) and serves as\nan all batteries included development environment.\n\nMade Possible by: [WEMPE Elektronic GmbH](https://wetech.de)\n\n# gOdoo-cli\n\nPython package that provides `godoo` command line interface around `odoo-bin`.\n\nIt\'s build with [Typer](https://github.com/tiangolo/typer) to provide some convenience Wrappers for Odoo development and\nDeployment.\n\nMost flags can be configured by Env variables. \\\nUse `godoo --help` to find out more. HINT: Install tab-completion with `godoo --install-completion`\n\n# Docker\n\nThis workspace also contains Docker and Docker-Compose files. \\\n\nThey are used to provide either easy Odoo instances where the source is pulled according to\n[ODOO_MANIFEST.yml](./ODOO_MANIFEST.yml), or as a all batteries included devcontainer for VScode.\n\n## Requirements\n\n- [Docker Compose](https://github.com/docker/compose)\n- [Traefik](https://doc.traefik.io/traefik/) container running with docker provider and "traefik" named docker network.\n  Example: [Traefik Devproxy](https://github.com/joshkreud/traefik_devproxy)\n- SSH Agent running. (check `echo $SSH_AUTH_SOCK`)\\\n  This gets passed trough in the Buildprocess to clone Thirdparty repos.\n\n## Just wanna have a quick and easy Odoo Instance?\n\n```bash\ngit clone https://github.com/OpenJKSoftware/gOdoo\ncd godoo\n. scripts/container_requirements.sh # Check Requirements\ndocker-compose build\ndocker-compose up\n# wait......\n# wait a bit mode ...\n# just a little bit longer ..\n# There we go.\n# Odoo should be reachable on \'https://godoo.docker.localhost\' assuming you didn\'t change .env TRAEFIK_HOST_RULE or COMPOSE_PROJECT_NAME\n```\n\n# Devcontainer\n\n## Features\n\n- All batteries included [Devcontainer](https://code.visualstudio.com/docs/remote/containers) with postgres service\n  Container and local DNS resolvig managed by [Traefik](https://doc.traefik.io/traefik/).\n- Easy fully working Odoo instance by `docker-compose up` with https access.\n- `godoo` CLI wrapper around Odoo. (Most flags can be configured by Environment Variables and are already preconfigured\n  in the Containers. See [.env.sample](./.env.sample))\n- `odoo-bin` is added to PATH and can thus be invoked from every folder.\n- Odoo will run in Proxy_Mode behind a Traefik reverse proxy for easy access on\n  `https://$COMPOSE_PROJECT_NAME.docker.localhost`\n- [Odoo Pylint plugin](https://github.com/OCA/pylint-odoo) preconfigured in vscode\n- Preinstalled vscode Extensions Highlights:\n  - [SQL Tools](https://marketplace.visualstudio.com/items?itemName=mtxr.sqltools) with preconfigured connection for\n    easy Database access in the Sidebar.\n  - [Docker Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) controls\n    container host.\n  - [Odoo Snippets](https://marketplace.visualstudio.com/items?itemName=mstuttgart.odoo-snippets)\n  - [Odoo Developments](https://marketplace.visualstudio.com/items?itemName=scapigliato.vsc-odoo-development) can Grab\n    Odoo Model information from a running Server\n  - [Todo Tree](https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.todo-tree)\n\n## Usage\n\n1. For Docker on windows: Clone the repo into the WSL2 Filesystem for better IO performance\n2. Have [Traefik](https://github.com/traefik/traefik) Running on `docker.localhost`\n   [Example](https://github.com/joshkreud/traefik_devproxy) \\\n   There must be a Docker network called `traefik` that can reach traefik.\n3. Open Devcontianer:\n   - If you have the Devcontainer CLI: `devcontainer open .`\n   - If not open the workspace in Local Vscode. In the Command pallete search for `Reopen in container`\n4. From **within the container** start Odoo using one of the following commands:\n   - You can enable godoo tab-completion by `godoo --install-completion`\n   - `make` -> Loads Odoo + Workspace Addons\n   - `make bare` -> Loads Odoo with ony `web` installed.\n   - `make kill` -> Search for `odoo-bin` processes and kill them\n   - `make reset` -> Drops DB, deletes config file and datafolder\n   - The full init script is available via "`godoo`". (See --help for Options)\n5. Open Odoo `https://$COMPOSE_PROJECT_NAME.docker.localhost`\\\n   For example `COMPOSE_PROJECT_NAME=godoo` --> [https://godoo.docker.localhost](https://godoo.docker.localhost)\n6. Login with `admin:admin`\n7. Profit!\n\n### Access to Odoo and Thirdparty addon Source\n\nYou can access the Odoo source by opening the VsCode workspace [full.code-workspace](full.code-workspace) from within\nthe Container. This will open a [Multi-Root Workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces).\nReally waiting for https://github.com/microsoft/vscode-remote-release/issues/3665 here.\n\n## Reset Devcontainer Data\n\nWhen you screwed up so bad its time to just start Over godoo has you covered:\n\n### Automatic Reset\n\nThere are 3 Options to reset the Dev Env.\n\n1. From **Outside** the Container run `make reset` in the project root to delete docker volumes and restart the\n   container. (Vscode will prompt to reconnect if still open)\n2. From **Outside** the Container run `make reset-hard` in the project root to force rebuild the main Odoo container and\n   then do the same as `make reset`\n3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and the bootstrap flag, which is way\n   quicker than the other options.\n\n### Manual Reset\n\n1. Close vscode\n2. Remove `app` and `db` container from docker.\n3. Remove volumes: `db, odoo_thirdparty, odoo_web, vscode_extensions`\n4. Restart Devcontainer\n\n## Python Debugging\n\n### VsCode Debugging\n\nDebugging doesn\'t reliably work with\n[Odoo Multiprocess](https://www.odoo.com/documentation/14.0/developer/misc/other/cmdline.html#multiprocessing) mode\nenabled. \\\nThe container ships with a Vscode Debug profile, that sets `--workers 0` to allow for Debugging Breakpoints. See [.vscode/launch.json](./.vscode/launch.json)\n\n### Interactive Shell\n\nUse `godoo shell` to enter an interactive shell on the Database.\n\n# Odoo Modules\n\n## Third Party Modules (manifest.yml)\n\nThe `godoo` bootstrap function, will download some modules using git. \\\nWhich Repos to download is specified in `ODOO_MANIFEST.yml` ([Default](./ODOO_MANIFEST.yml)) \\\nNot all of the cloned addons are automatically installed. \\\nInstall them via the Apps Page in Odoo using `godoo rpc modules install` or using `odoo-bin`.\\\nModules downloaded on the Odoo Marketplace can be dropped as a `.zip` archive in [./thirdparty](./thirdparty)\n',
     'author': 'Joshua Kreuder',
     'author_email': 'Joshua_Kreuder@outlook.com',
     'maintainer': 'None',

{godoo_cli-0.1.4 → godoo_cli-0.1.5}/src/godoo_cli/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"
 from .cli import launch_cli

{godoo_cli-0.1.4 → godoo_cli-0.1.5}/src/godoo_cli/commands/test.py

@@ -6,7 +6,7 @@ from typing import List
 import typer
 
 from ..helpers.cli import typer_retuner
-from ..helpers.odoo_files import get_changed_modules, get_depends_of_modules, get_odoo_module_paths
+from ..helpers.odoo_files import get_changed_modules, get_depends_of_module, get_odoo_module_paths
 from .launch import launch_odoo as launch_odoo
 
 LOGGER = logging.getLogger(__name__)
@@ -24,7 +24,12 @@ def _test_modules_special_cases(in_modules: List[str], workspace_addon_path: Pat
             changed_modules = get_changed_modules(addon_path=workspace_addon_path, diff_branch=compare_branch)
             if not changed_modules:
                 return []
-            out_modules = get_depends_of_modules(workspace_addon_path, changed_modules)
+            change_modules_depends = []
+            for module in changed_modules:
+                change_modules_depends += get_depends_of_module(
+                    out_modules, module, already_done_modules=change_modules_depends
+                )
+            out_modules = changed_modules + change_modules_depends
         if out_modules:
             out_modules_with_tests = [p for p in out_modules if any(p.rglob("tests/__init__.py"))]
             return [p.stem for p in out_modules_with_tests]

{godoo_cli-0.1.4 → godoo_cli-0.1.5}/src/godoo_cli/helpers/odoo_files.py

@@ -71,42 +71,52 @@ def get_changed_modules(
     return changed_module_folders
 
 
-def get_depends_of_modules(addon_path: Path, in_module_paths: List[Path]) -> List[Path]:
-    """Get Modules which do depend on given modules. Recursive.
+def get_depends_of_module(
+    all_modules: List[Path],
+    module_to_check: Path,
+    already_done_modules: List[Path] = None,
+):
+    """Recursively Searches sub dependencies for Odoo modules.
+
 
     Parameters
     ----------
-    addon_path : Path
-        Folder where to look for Depends of in_module_paths
-    in_module_paths : List[Path]
-        List of Module Paths of which we want to get the downstream dependencies
+    all_modules : List[Path]
+        List of Path objects pointing to odoo modules
+    module_to_check : Path
+        path with odoo module
+    already_done_modules : List[Path], optional
+        Only used internally for recursion caching, by default None
 
     Returns
     -------
     List[Path]
-        Union of in_module_paths and all their downstream depends.
+        Paths to dependency modules
     """
-    all_modules = get_odoo_module_paths(addon_path)
-    if not in_module_paths:
-        return
-    added = True
-    LOGGER.debug("Searching Depends for: %s", ", ".join([str(p) for p in in_module_paths]))
-    out_depends = in_module_paths.copy()
-    while added:
-        added = False
-        for module in all_modules:
-            manifest_path = module / "__manifest__.py"
-            current_module = module.absolute()
-            if current_module in out_depends:
+    manifest_path = module_to_check / "__manifest__.py"
+
+    if not already_done_modules:
+        already_done_modules = []
+    if module_to_check.absolute() in already_done_modules:
+        return []
+    already_done_modules.append(module_to_check.absolute())
+
+    LOGGER.debug("Loading Manifest: %s", manifest_path.absolute())
+    manifest = literal_eval(manifest_path.read_text())
+    module_depends = manifest.get("depends", [])
+    sub_depends = []
+    for dep in module_depends:
+        dep_path = [p for p in all_modules if p.stem == dep]
+        if dep_path:
+            dep_path = dep_path[0]
+            if dep_path.absolute() in already_done_modules:
                 continue
-            LOGGER.debug("Loading Manifest: %s", manifest_path.absolute())
-            manifest = literal_eval(manifest_path.read_text())
-            module_depends = manifest.get("depends", [])
-            if any(item.stem in module_depends for item in out_depends):
-                out_depends.append(module.absolute())
-                added = True
-    LOGGER.debug("Found Depends: %s", ", ".join([str(d) for d in out_depends if d not in in_module_paths]))
-    return out_depends
+            sub_depends.append(dep_path.absolute())
+            sub_depends += get_depends_of_module(all_modules, dep_path, already_done_modules)
+        elif dep != "base":
+            LOGGER.warn("Could not find Dependency: '%s' in available modules", dep)
+
+    return list(set(sub_depends))
 
 
 def get_addon_paths(
@@ -155,17 +165,29 @@ def _get_python_requirements_of_modules(addon_paths: List[Path], filter_module_n
     filter_module_names : List[str], optional
         Modules to look for manifests, by default all available modules
     """
-    LOGGER.debug("Checking python requirements of Modules: %s", ", ".join(filter_module_names))
     available_modules = get_odoo_module_paths(addon_paths)
     available_module_names = [p.stem for p in available_modules]
+
     if not filter_module_names:
         filter_module_names = available_module_names
     filter_module_names = [f for f in filter_module_names if f not in ["base", "web"]]
+    LOGGER.info("Checking python requirements of Modules: %s", ", ".join(sorted(filter_module_names)))
 
     if unavailable_modules := [m for m in filter_module_names if m not in available_module_names]:
         LOGGER.warning("Couldn't search Python reqs for unavailable Modules: %s", ", ".join(unavailable_modules))
 
     check_modules = [mp for mp in available_modules if mp.stem in filter_module_names]
+    check_modules_dependencies = []
+    for module in check_modules:
+        check_modules_dependencies += get_depends_of_module(
+            available_modules, module, already_done_modules=check_modules_dependencies
+        )
+    LOGGER.debug(
+        "adding child modules to check list: %s", ", ".join(sorted([p.stem for p in check_modules_dependencies]))
+    )
+
+    check_modules += check_modules_dependencies
+
     if not check_modules:
         LOGGER.debug("No Modules provided to check for python Requirements")
         return
@@ -177,4 +199,4 @@ def _get_python_requirements_of_modules(addon_paths: List[Path], filter_module_n
         if module_depends := manifest.get("external_dependencies", {}).get("python"):
             python_depends += module_depends
 
-    return python_depends
+    return list(set(python_depends))