odoo-dev 0.2.3__tar.gz → 0.2.5__tar.gz

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/.claude/settings.local.json

@@ -2,7 +2,9 @@
   "permissions": {
     "allow": [
       "Bash(git add:*)",
-      "Bash(git commit -m \"$\\(cat <<''EOF''\nAdd project URLs and bump version to 0.2.2\n\nAdd repository links to PyPI package page.\nEOF\n\\)\")"
+      "Bash(git commit -m \"$\\(cat <<''EOF''\nAdd project URLs and bump version to 0.2.2\n\nAdd repository links to PyPI package page.\nEOF\n\\)\")",
+      "Bash(ls:*)",
+      "Bash(xargs:*)"
     ]
   }
 }

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: odoo-dev
-Version: 0.2.3
+Version: 0.2.5
 Summary: Odoo Development Environment Helper
 Project-URL: Homepage, https://git.bemade.org/bemade/odoo-dev
 Project-URL: Repository, https://git.bemade.org/bemade/odoo-dev
 Project-URL: Issues, https://git.bemade.org/bemade/odoo-dev/-/issues
+License-Expression: LGPL-3.0
 Requires-Python: >=3.12
 Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.9.0

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "odoo-dev"
-version = "0.2.3"
+version = "0.2.5"
 description = "Odoo Development Environment Helper"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -8,6 +8,7 @@ dependencies = [
     "typer>=0.9.0",
     "rich>=13.0.0",
 ]
+license = "LGPL-3.0"
 
 [project.urls]
 Homepage = "https://git.bemade.org/bemade/odoo-dev"
@@ -20,6 +21,7 @@ odoo-dev = "odoo_dev.cli:app"
 [dependency-groups]
 dev = [
     "pytest>=8.0.0",
+    "black",
 ]
 
 [tool.pytest.ini_options]

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/src/odoo_dev/__init__.py

@@ -1,3 +1,3 @@
 """Odoo Development Environment Helper."""
 
-__version__ = "0.2.3"
+__version__ = "0.2.5"

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/src/odoo_dev/cli.py

@@ -35,6 +35,7 @@ def _main(
     """Odoo Development Environment Helper."""
     pass
 
+
 # Command groups
 app.add_typer(db.app, name="db")
 app.add_typer(docker.app, name="docker")

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/src/odoo_dev/commands/docker.py

@@ -71,6 +71,7 @@ def build(
     ),
 ) -> None:
     """Rebuild the Odoo Docker image."""
+    import importlib.resources
     import shutil
 
     cfg = load_config()
@@ -81,10 +82,19 @@ def build(
     build_context.mkdir(parents=True, exist_ok=True)
 
     try:
-        # Copy necessary files to build context
-        shutil.copy(cfg.script_dir / "Dockerfile", build_context)
-        shutil.copy(cfg.script_dir / "docker-entrypoint.sh", build_context)
-        shutil.copy(cfg.docker_config_file, build_context / "odoo.conf")
+        # Write Docker templates directly to build context from package
+        templates = importlib.resources.files("odoo_dev.templates.docker")
+        for filename in ["Dockerfile", "docker-entrypoint.sh"]:
+            (build_context / filename).write_text(
+                templates.joinpath(filename).read_text()
+            )
+
+        # Generate Docker odoo.conf
+        from odoo_dev.commands.setup import _generate_docker_odoo_conf
+
+        (build_context / "odoo.conf").write_text(
+            _generate_docker_odoo_conf(community_only=community)
+        )
 
         # Copy requirements files
         if (cfg.project_dir / "requirements.txt").exists():

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/src/odoo_dev/commands/run.py

@@ -17,10 +17,12 @@ def run(
         str | None, typer.Option("-d", "--database", help="Database name")
     ] = None,
     install: Annotated[
-        str | None, typer.Option("-i", "--init", help="Modules to install (comma-separated)")
+        str | None,
+        typer.Option("-i", "--init", help="Modules to install (comma-separated)"),
     ] = None,
     update: Annotated[
-        str | None, typer.Option("-u", "--update", help="Modules to update (comma-separated)")
+        str | None,
+        typer.Option("-u", "--update", help="Modules to update (comma-separated)"),
     ] = None,
     dev: Annotated[
         str | None,
@@ -29,9 +31,7 @@ def run(
     debug: Annotated[
         bool, typer.Option("--debug", help="Enable debugpy for VSCode debugging")
     ] = False,
-    port: Annotated[
-        int, typer.Option("-p", "--port", help="HTTP port")
-    ] = 8069,
+    port: Annotated[int, typer.Option("-p", "--port", help="HTTP port")] = 8069,
 ) -> None:
     """Run Odoo locally."""
     cfg = load_config()
@@ -352,9 +352,9 @@ def test(
             [
                 str(venv_python),
                 str(cfg.odoo_bin),
-                "db",
                 "-c",
                 str(cfg.config_file),
+                "db",
                 "drop",
                 db_name,
             ],

{odoo_dev-0.2.3 → odoo_dev-0.2.5}/src/odoo_dev/commands/setup.py

@@ -1,6 +1,8 @@
 """Setup commands for initializing Odoo development environment."""
 
+import importlib.resources
 import os
+import shutil
 import subprocess
 from pathlib import Path
 
@@ -75,12 +77,27 @@ def _update_env_file(env_file: Path, updates: dict[str, str]) -> None:
     env_file.write_text(content + "\n")
 
 
+def _clean():
+    cfg = load_config()
+    success("Cleaning up current environment...")
+    for name in ["odoo", "enterprise", "design-themes", "industry", ".venv"]:
+        path = cfg.project_dir / name
+        if path.exists():
+            shutil.rmtree(path)
+    success("Clean up complete.")
+
+
 def setup(
     community: bool = typer.Option(
         False,
         "--community",
         help="Set up Community edition only (skip Enterprise repos)",
     ),
+    clean: bool = typer.Option(
+        False,
+        "--clean",
+        help="Clean up before setup (remove existing venv, etc.)",
+    ),
 ) -> None:
     """Complete setup: clone Odoo repos, configure VSCode, build image."""
     # Prompt for versions if not configured
@@ -88,6 +105,8 @@ def setup(
 
     cfg = load_config()
 
+    if clean:
+        _clean()
     success("Setting up complete Odoo development environment...")
 
     # Initialize/update git submodules first
@@ -112,6 +131,9 @@ def setup(
     # Prompt for Docker setup
     warning("\nDo you want to set up the Docker environment?")
     if typer.confirm("Continue with Docker setup?", default=True):
+        # Set up Docker files first
+        _setup_docker_files(cfg, community_only=community)
+
         success("\nBuilding Docker image...")
         from odoo_dev.commands.docker import build
 
@@ -207,25 +229,23 @@ def vscode(cfg=None) -> None:
     vscode_dir = cfg.project_dir / ".vscode"
     vscode_dir.mkdir(exist_ok=True)
 
-    template_dir = cfg.script_dir / "templates" / "vscode"
+    # Get the templates directory from the package
+    templates = importlib.resources.files("odoo_dev.templates.vscode")
 
     # Copy template files
-    import shutil
-
     for template_file in ["launch.json", "tasks.json"]:
-        src = template_dir / template_file
+        template_content = templates.joinpath(template_file).read_text()
         dst = vscode_dir / template_file
-        if src.exists():
-            shutil.copy(src, dst)
-            success(f"Copied {template_file}")
+        dst.write_text(template_content)
+        success(f"Copied {template_file}")
 
     # Only copy settings.json if it doesn't exist
-    settings_src = template_dir / "settings.json"
     settings_dst = vscode_dir / "settings.json"
-    if settings_src.exists() and not settings_dst.exists():
-        shutil.copy(settings_src, settings_dst)
+    if not settings_dst.exists():
+        settings_content = templates.joinpath("settings.json").read_text()
+        settings_dst.write_text(settings_content)
         success("Copied settings.json")
-    elif settings_dst.exists():
+    else:
         warning("settings.json already exists. Skipping.")
 
     success("VSCode configuration set up successfully!")
@@ -298,6 +318,85 @@ db_password = odoo
     success(f"Config file created at {conf_file}")
 
 
+def _setup_docker_files(cfg, community_only: bool = False) -> None:
+    """Copy Docker templates to .odoo-deploy directory."""
+    success("Setting up Docker files...")
+
+    # Create .odoo-deploy directory
+    cfg.script_dir.mkdir(exist_ok=True)
+
+    # Get the templates directory from the package
+    templates = importlib.resources.files("odoo_dev.templates.docker")
+
+    # Copy Dockerfile and docker-entrypoint.sh
+    for filename in ["Dockerfile", "docker-entrypoint.sh"]:
+        template_content = templates.joinpath(filename).read_text()
+        dest = cfg.script_dir / filename
+        dest.write_text(template_content)
+        if filename.endswith(".sh"):
+            dest.chmod(0o755)
+        success(f"Copied {filename}")
+
+    # Create Docker odoo.conf
+    _setup_docker_odoo_config(cfg, community_only=community_only)
+
+
+def _generate_docker_odoo_conf(community_only: bool = False) -> str:
+    """Generate Docker-specific odoo.conf content."""
+    # Build addons path for Docker (using /opt/project paths)
+    addons_paths = [
+        "/opt/project/odoo/addons",
+        "/opt/project/odoo/odoo/addons",
+    ]
+
+    if not community_only:
+        addons_paths.append("/opt/project/enterprise")
+
+    addons_paths.extend(
+        [
+            "/opt/project/design-themes",
+            "/opt/project/industry",
+            "/opt/project/addons",
+        ]
+    )
+
+    return f"""[options]
+addons_path = {",".join(addons_paths)}
+admin_passwd = admin
+db_host = db
+db_port = 5432
+db_user = odoo
+db_password = odoo
+http_port = 8069
+gevent_port = 8072
+proxy_mode = True
+dev_mode = True
+log_level = info
+list_db = True
+limit_memory_hard = 0
+limit_memory_soft = 2147483648
+limit_time_cpu = 600
+limit_time_real = 1200
+workers = 0
+max_cron_threads = 1
+data_dir = /opt/odoo-filestore
+"""
+
+
+def _setup_docker_odoo_config(cfg, community_only: bool = False) -> None:
+    """Create Docker-specific odoo.conf configuration file."""
+    conf_file = cfg.docker_config_file
+
+    if conf_file.exists():
+        warning(f"Docker config file already exists at {conf_file}")
+        return
+
+    success("Creating Docker Odoo configuration file...")
+    conf_file.write_text(_generate_docker_odoo_conf(community_only=community_only))
+    conf_file.chmod(0o600)
+    success(f"Docker config file created at {conf_file}")
+
+
 def _clone_odoo_repos(cfg, community_only: bool = False) -> None:
     """Clone or update Odoo repositories."""
     success("Setting up Odoo repositories...")
@@ -305,22 +404,25 @@ def _clone_odoo_repos(cfg, community_only: bool = False) -> None:
     if community_only:
         warning("Community edition mode: Enterprise repositories will be skipped")
 
+    # Use HTTPS for odoo (public), SSH for all others (private)
     repos = [
-        (f"git@github.com:odoo/odoo.git", "odoo", cfg.odoo_version),
-        (f"git@github.com:odoo/design-themes.git", "design-themes", cfg.odoo_version),
+        ("https://github.com/odoo/odoo.git", "odoo", cfg.odoo_version),
     ]
 
-    # Add enterprise if not community only
+    # Private repos require SSH
+    repos.append(
+        ("git@github.com:odoo/design-themes.git", "design-themes", cfg.odoo_version)
+    )
+
+    # Add enterprise if not community only (private repo, needs SSH)
     if not community_only:
         repos.append(
-            (f"git@github.com:odoo/enterprise.git", "enterprise", cfg.odoo_version)
+            ("git@github.com:odoo/enterprise.git", "enterprise", cfg.odoo_version)
         )
 
-    # Add industry for Odoo 18+
+    # Add industry for Odoo 18+ (private repo)
     if cfg.odoo_version.startswith("18") or cfg.odoo_version.startswith("19"):
-        repos.append(
-            (f"git@github.com:odoo/industry.git", "industry", cfg.odoo_version)
-        )
+        repos.append(("git@github.com:odoo/industry.git", "industry", cfg.odoo_version))
 
     for repo_url, repo_dir, branch in repos:
         repo_path = cfg.project_dir / repo_dir
@@ -355,6 +457,15 @@ def _clone_odoo_repos(cfg, community_only: bool = False) -> None:
     success("Odoo repositories setup complete.")
 
 
+def _can_sudo_without_password() -> bool:
+    """Check if sudo can run without prompting for password."""
+    result = subprocess.run(
+        ["sudo", "-n", "true"],
+        capture_output=True,
+    )
+    return result.returncode == 0
+
+
 def _install_system_dependencies() -> None:
     """Install system dependencies based on OS."""
     import platform
@@ -376,6 +487,13 @@ def _install_system_dependencies() -> None:
             check=False,
         )
     elif system == "Linux":
+        if not _can_sudo_without_password():
+            warning(
+                "Cannot run sudo without password. "
+                "Please install system dependencies manually or run with sudo."
+            )
+            return
+
         success("Installing dependencies for Linux...")
         subprocess.run(
             [

odoo_dev-0.2.5/src/odoo_dev/templates/__init__.py

@@ -0,0 +1 @@
+# Templates package for odoo-dev

{odoo_dev-0.2.3/tests/fixtures/odoo-empty/.odoo-deploy → odoo_dev-0.2.5/src/odoo_dev/templates/docker}/Dockerfile

@@ -3,6 +3,9 @@ FROM python:${PYTHON_VERSION}-slim-bookworm
 
 ARG ODOO_VERSION=17.0
 
+# Install uv for fast package management
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
 # Install system dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
@@ -20,7 +23,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     npm \
     python3-num2words \
     python3-pdfminer \
-    python3-pip \
     python3-phonenumbers \
     python3-pyldap \
     python3-qrcode \
@@ -43,7 +45,7 @@ RUN curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases
     && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # Install debugpy
-RUN pip install --no-cache-dir --break-system-packages debugpy
+RUN uv pip install --system --no-cache debugpy
 
 # Create odoo user and directories
 RUN useradd -ms /bin/bash -d /opt/odoo odoo && \
@@ -60,8 +62,8 @@ COPY odoo-requirements.txt /tmp/odoo-requirements.txt
 COPY requirements.txt /tmp/requirements.txt
 
 # Install Python dependencies
-RUN pip install --no-cache-dir --break-system-packages -r /tmp/odoo-requirements.txt
-RUN pip install --no-cache-dir --break-system-packages -r /tmp/requirements.txt
+RUN uv pip install --system --no-cache -r /tmp/odoo-requirements.txt
+RUN uv pip install --system --no-cache -r /tmp/requirements.txt
 
 # Copy entrypoint script
 COPY ./docker-entrypoint.sh /

odoo_dev-0.2.5/src/odoo_dev/templates/docker/__init__.py

@@ -0,0 +1 @@
+# Docker templates package

odoo_dev-0.2.5/src/odoo_dev/templates/vscode/__init__.py

@@ -0,0 +1 @@
+# VSCode templates package

{odoo_dev-0.2.3/tests/fixtures/odoo-empty/.odoo-deploy → odoo_dev-0.2.5/src/odoo_dev}/templates/vscode/launch.json

@@ -29,7 +29,7 @@
             "console": "integratedTerminal",
             "args": [
                 "-c",
-                "${workspaceFolder}/conf/odoo.conf",
+                "${workspaceFolder}/conf/odoo.conf"
             ],
             "env": {
                 "PYTHONWARNINGS": "ignore:FutureWarning",
@@ -57,6 +57,30 @@
                 "GEVENT_SUPPORT": "True"
             }
         },
+        {
+            "name": "Odoo Local: Integration Test",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/odoo/odoo-bin",
+            "console": "integratedTerminal",
+            "args": [
+                "-c",
+                "${workspaceFolder}/conf/odoo.conf",
+                "-u",
+                "${input:modules}",
+                "-i",
+                "${input:modules}",
+                "--test-enable",
+                "-d",
+                "${input:database}",
+                "--stop-after-init",
+                "--no-http"
+            ],
+            "env": {
+                "PYTHONWARNINGS": "ignore:FutureWarning",
+                "GEVENT_SUPPORT": "True"
+            }
+        },
         {
             "name": "Odoo Local: Test",
             "type": "debugpy",
@@ -181,4 +205,4 @@
             "justMyCode": false
         }
     ]
-}
+}

{odoo_dev-0.2.3/tests/fixtures/odoo-empty/.odoo-deploy → odoo_dev-0.2.5/src/odoo_dev}/templates/vscode/settings.json

@@ -1,5 +1,5 @@
 {
-    "python.defaultInterpreterPath": "${workspaceFolder}/venv/bin/python",
+    "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
     "python": {
         "editor.defaultFormatter": "ms-python.black-formatter",
         "editor.formatOnSave": true,

{odoo_dev-0.2.3/tests/fixtures/odoo-empty/.odoo-deploy → odoo_dev-0.2.5/src/odoo_dev}/templates/vscode/tasks.json

@@ -4,7 +4,7 @@
         {
             "label": "Update Module",
             "type": "shell",
-            "command": "cd ${workspaceFolder}/.odoo-deploy && ./odoo-dev.sh update ${input:moduleName}",
+            "command": "odoo-dev docker restart",
             "presentation": {
                 "reveal": "always",
                 "panel": "new"
@@ -13,7 +13,7 @@
         {
             "label": "Start Odoo Shell",
             "type": "shell",
-            "command": "cd ${workspaceFolder}/.odoo-deploy && ./odoo-dev.sh shell",
+            "command": "odoo-dev docker shell ${input:database}",
             "presentation": {
                 "reveal": "always",
                 "panel": "new"
@@ -22,7 +22,7 @@
         {
             "label": "Restart Odoo",
             "type": "shell",
-            "command": "cd ${workspaceFolder}/.odoo-deploy && ./odoo-dev.sh restart",
+            "command": "odoo-dev docker restart",
             "presentation": {
                 "reveal": "always",
                 "panel": "new"
@@ -31,9 +31,9 @@
     ],
     "inputs": [
         {
-            "id": "moduleName",
-            "description": "Module name to update (comma-separated for multiple, or 'all')",
-            "default": "all",
+            "id": "database",
+            "description": "Database name",
+            "default": "",
             "type": "promptString"
         }
     ]