quickscale-cli 0.83.0__tar.gz → 0.84.0__tar.gz

{quickscale_cli-0.83.0 → quickscale_cli-0.84.0}/PKG-INFO

@@ -1,20 +1,21 @@
 Metadata-Version: 2.4
 Name: quickscale-cli
-Version: 0.83.0
+Version: 0.84.0
 Summary: Command-line interface for QuickScale Django project generator
 License-Expression: Apache-2.0
 Keywords: django,cli,project-generator,saas
 Author: Experto AI
 Author-email: victor@experto.ai
-Requires-Python: >=3.12,<3.14
+Requires-Python: >=3.13,<3.15
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 6.0
 Requires-Dist: click (>=8.3.1,<9.0.0)
-Requires-Dist: quickscale-core (>=0.83.0,<0.84.0)
+Requires-Dist: quickscale-core (>=0.84.0,<0.85.0)
 Project-URL: Documentation, https://github.com/Experto-AI/quickscale/tree/main/docs
 Project-URL: Homepage, https://github.com/Experto-AI/quickscale
 Project-URL: Repository, https://github.com/Experto-AI/quickscale

{quickscale_cli-0.83.0 → quickscale_cli-0.84.0}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "quickscale-cli"
-version = "0.83.0"
+version = "0.84.0"
 description = "Command-line interface for QuickScale Django project generator"
-requires-python = ">=3.12,<3.14"
+requires-python = ">=3.13,<3.15"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [{name = "Experto AI", email = "victor@experto.ai"}]
@@ -11,6 +11,7 @@ classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
     "Framework :: Django",
     "Framework :: Django :: 6.0",
@@ -29,9 +30,9 @@ quickscale = "quickscale_cli.main:cli"
 packages = [{include = "quickscale_cli", from = "src"}]
 
 [tool.poetry.dependencies]
-python = ">=3.12,<3.14"
+python = ">=3.13,<3.15"
 click = "^8.3.1"
-quickscale-core = "^0.83.0"
+quickscale-core = "^0.84.0"
 
 [tool.poetry.group.dev.dependencies]
 # Dev dependencies centralized in root pyproject.toml

{quickscale_cli-0.83.0 → quickscale_cli-0.84.0}/src/quickscale_cli/_version.py

@@ -1,2 +1,2 @@
 # Auto-generated by scripts/version_tool.sh
-__version__ = "0.83.0"
+__version__ = "0.84.0"

{quickscale_cli-0.83.0 → quickscale_cli-0.84.0}/src/quickscale_cli/commands/development_commands.py

@@ -10,6 +10,7 @@ import click
 
 from quickscale_cli.schema.config_schema import QuickScaleConfig
 from quickscale_cli.utils.docker_utils import (
+    DockerComposePluginRequiredError,
     get_docker_compose_command,
     get_port_from_env,
     is_docker_running,
@@ -74,8 +75,32 @@ def _show_port_conflict_error(port: int | str) -> None:
     )
 
 
+def _show_compose_v2_required_error() -> None:
+    """Display a user-friendly error when Docker Compose v2 is unavailable."""
+    click.secho(
+        "❌ Error: Docker Compose v2 plugin is required",
+        fg="red",
+        err=True,
+    )
+    click.echo(
+        "💡 Tip: Install or update Docker so the 'docker compose' command is "
+        "available. QuickScale keeps the generated 'docker-compose.yml' file "
+        "name, but the CLI uses the Docker Compose v2 plugin.",
+        err=True,
+    )
+
+
+def _require_docker_compose_command() -> list[str]:
+    """Return the Docker Compose v2 command or exit with remediation text."""
+    try:
+        return get_docker_compose_command()
+    except DockerComposePluginRequiredError:
+        _show_compose_v2_required_error()
+        sys.exit(1)
+
+
 def _run_docker_compose_up(compose_cmd: list, build: bool, no_cache: bool) -> None:
-    """Execute docker-compose up with appropriate flags."""
+    """Execute docker compose up with appropriate flags."""
     if build or no_cache:
         cmd = compose_cmd + ["--progress", "plain", "up", "-d"]
     else:
@@ -101,7 +126,7 @@ def _run_docker_compose_up(compose_cmd: list, build: bool, no_cache: bool) -> No
 
 
 def _handle_up_error(error: subprocess.CalledProcessError) -> None:
-    """Handle docker-compose up errors with user-friendly messages."""
+    """Handle docker compose up errors with user-friendly messages."""
     error_output = error.stderr if error.stderr else ""
     stdout_output = error.stdout if error.stdout else ""
     full_output = error_output + stdout_output
@@ -122,7 +147,7 @@ def _handle_up_error(error: subprocess.CalledProcessError) -> None:
         click.echo(
             f"\n💡 To resolve this issue, try one of the following:\n"
             f"   1. Stop existing containers: quickscale down\n"
-            f"   2. Remove orphaned containers: docker-compose down --remove-orphans\n"
+            f"   2. Remove orphaned containers: docker compose down --remove-orphans\n"
             f"   3. Find and kill the process: lsof -ti:{conflict_port} | xargs kill -9\n"
             f"   4. Find process details: sudo lsof -i:{conflict_port}\n"
             f"   5. Or use: sudo fuser -k {conflict_port}/tcp",
@@ -272,14 +297,14 @@ def up(build: bool, no_cache: bool) -> None:
         )
         click.secho("   quickscale down && quickscale up --build\n", fg="cyan")
 
-    # Check if required port is available BEFORE calling docker-compose
+    # Check if required port is available BEFORE calling docker compose.
     port = get_port_from_env()
     if not is_port_available(port):
         _show_port_conflict_error(port)
         sys.exit(1)
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         _run_docker_compose_up(compose_cmd, should_build, no_cache)
 
         # Update build timestamp if build was performed
@@ -326,7 +351,7 @@ def down(volumes: bool) -> None:
     _validate_project_and_docker()
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         cmd = compose_cmd + ["down", "--remove-orphans"]
 
         if volumes:
@@ -468,7 +493,7 @@ def logs(service: str | None, follow: bool, tail: str | None, timestamps: bool)
     _validate_project_and_docker()
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         cmd = compose_cmd + ["logs"]
 
         if follow:
@@ -503,7 +528,7 @@ def ps() -> None:
     _validate_project_and_docker()
 
     try:
-        compose_cmd = get_docker_compose_command()
+        compose_cmd = _require_docker_compose_command()
         cmd = compose_cmd + ["ps"]
         subprocess.run(cmd, check=True)
 

{quickscale_cli-0.83.0 → quickscale_cli-0.84.0}/src/quickscale_cli/utils/dependency_utils.py

@@ -42,13 +42,13 @@ class DependencyStatus(NamedTuple):
 
 
 def check_python_version() -> DependencyStatus:
-    """Check Python version (3.14+ required)."""
+    """Check Python version (3.13+ required)."""
     import sys
 
     version = (
         f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
     )
-    meets_requirement = sys.version_info >= (3, 14)
+    meets_requirement = sys.version_info >= (3, 13)
 
     return DependencyStatus(
         name="Python",
@@ -151,7 +151,7 @@ def check_git_installed() -> DependencyStatus:
 
 
 def check_docker_installed() -> DependencyStatus:
-    """Check if Docker and Docker Compose are installed."""
+    """Check if Docker and the Docker Compose v2 plugin are installed."""
 
     if _should_skip_dependency_checks():
         return _skipped_dependency(
@@ -176,45 +176,28 @@ def check_docker_installed() -> DependencyStatus:
             parts = version_str.split()
             version = parts[2].rstrip(",") if len(parts) >= 3 else None
 
-            # Also check for Docker Compose (either v2 plugin or v1 standalone)
-            compose_available = False
+            # Docker-backed workflows require the Compose v2 plugin.
             try:
-                # Try docker compose v2 (plugin)
                 subprocess.run(
                     ["docker", "compose", "version"],
                     capture_output=True,
                     check=True,
                     timeout=2,
                 )
-                compose_available = True
             except (
                 subprocess.SubprocessError,
                 FileNotFoundError,
                 subprocess.TimeoutExpired,
             ):
-                # Try docker-compose v1 (standalone)
-                try:
-                    subprocess.run(
-                        ["docker-compose", "--version"],
-                        capture_output=True,
-                        check=True,
-                        timeout=2,
-                    )
-                    compose_available = True
-                except (
-                    subprocess.SubprocessError,
-                    FileNotFoundError,
-                    subprocess.TimeoutExpired,
-                ):
-                    pass
-
-            if not compose_available:
                 return DependencyStatus(
                     name="Docker",
                     installed=False,
                     version=version,
                     required=False,
-                    purpose="Containerized development (quickscale up/down) - Docker Compose not found",
+                    purpose=(
+                        "Containerized development (quickscale up/down) - "
+                        "Docker Compose v2 plugin not found"
+                    ),
                 )
 
             return DependencyStatus(

{quickscale_cli-0.83.0 → quickscale_cli-0.84.0}/src/quickscale_cli/utils/docker_utils.py

@@ -7,6 +7,10 @@ import time
 from pathlib import Path
 
 
+class DockerComposePluginRequiredError(RuntimeError):
+    """Raised when the Docker Compose v2 plugin is unavailable."""
+
+
 def is_interactive() -> bool:
     """Check if running in an interactive terminal (has TTY)."""
     return sys.stdout.isatty() and sys.stdin.isatty()
@@ -32,24 +36,22 @@ def find_docker_compose() -> Path | None:
 
 
 def get_docker_compose_command() -> list[str]:
-    """Get the appropriate docker compose command.
-
-    Tries 'docker compose' (v2 plugin) first, falls back to 'docker-compose' (v1 standalone).
-    Both are fully supported.
-    """
-    # Try docker compose first (v2 plugin)
+    """Get the Docker Compose v2 command."""
     try:
         subprocess.run(
             ["docker", "compose", "version"], capture_output=True, check=True, timeout=2
         )
-        return ["docker", "compose"]
     except (
         subprocess.SubprocessError,
         FileNotFoundError,
         subprocess.TimeoutExpired,
-    ):
-        # Fall back to docker-compose (v1 standalone)
-        return ["docker-compose"]
+    ) as error:
+        raise DockerComposePluginRequiredError(
+            "Docker Compose v2 is required. Install or update Docker so the "
+            "'docker compose' command is available."
+        ) from error
+
+    return ["docker", "compose"]
 
 
 def get_container_status(container_name: str) -> str | None: