qontract-development-cli 0.17.1__tar.gz → 0.18.0__tar.gz

qontract_development_cli-0.18.0/.gitignore

@@ -0,0 +1,2 @@
+# Created by venv; see https://docs.python.org/3/library/venv.html
+*

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: qontract-development-cli
-Version: 0.17.1
+Version: 0.18.0
 Summary: Helper tool for qontract-reconcile development
 Project-URL: homepage, http://github.com/chassing/qontract-development-cli
 Project-URL: repository, http://github.com/chassing/qontract-development-cli
 Project-URL: documentation, http://github.com/chassing/qontract-development-cli
 Author-email: Christian Assing <cassing@redhat.com>
 License: MIT
-Requires-Python: >=3.11
+Requires-Python: >=3.14
 Requires-Dist: appdirs~=1.4.4
 Requires-Dist: getkey~=0.6.5
 Requires-Dist: jinja2~=3.1
@@ -16,7 +16,7 @@ Requires-Dist: pydantic~=2.9
 Requires-Dist: pyyaml~=6.0.2
 Requires-Dist: rich~=15.0
 Requires-Dist: typer~=0.25.1
-Requires-Dist: watchfiles~=1.1.0
+Requires-Dist: watchfiles~=1.2.0
 Description-Content-Type: text/markdown
 
 # Qontract Development CLI

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "qontract-development-cli"
-version = "0.17.1"
+version = "0.18.0"
 description = "Helper tool for qontract-reconcile development"
 authors = [{ name = "Christian Assing", email = "cassing@redhat.com" }]
 license = { text = "MIT" }
 readme = "README.md"
-requires-python = ">= 3.11"
+requires-python = ">= 3.14"
 dependencies = [
     "appdirs ~=1.4.4",
     "getkey ~=0.6.5",
@@ -15,7 +15,7 @@ dependencies = [
     "pyyaml ~=6.0.2",
     "rich ~=15.0",
     "typer ~=0.25.1",
-    "watchfiles ~=1.1.0",
+    "watchfiles ~=1.2.0",
 ]
 
 [dependency-groups]
@@ -61,7 +61,6 @@ ignore_missing_imports = true
 
 [tool.ruff]
 line-length = 88
-target-version = 'py311'
 src = ["qontract_development_cli"]
 extend-exclude = [".local", ".cache"]
 fix = true
@@ -109,3 +108,13 @@ preview = true
 
 [tool.ruff.lint.isort]
 known-first-party = ["qontract_development_cli"]
+
+[tool.ruff.lint.flake8-type-checking]
+runtime-evaluated-base-classes = ["pydantic.BaseModel"]
+runtime-evaluated-decorators = [
+    "dataclasses.dataclass",
+    "pydantic.dataclasses.dataclass",
+    "pydantic.validate_call",
+    "typer.Typer.command",
+    "typer.Typer.callback",
+]

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/commands/profile.py

@@ -1,8 +1,9 @@
 import logging
 import subprocess
 import tempfile
+from multiprocessing import Process
 from pathlib import Path
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated
 
 import typer
 from getkey import getkey
@@ -34,9 +35,6 @@ from ..shell import (
 from ..templates import template
 from ..utils import console
 
-if TYPE_CHECKING:
-    from multiprocessing import Process
-
 app = typer.Typer()
 log = logging.getLogger(__name__)
 

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/models.py

@@ -66,7 +66,7 @@ class ProfileSettings(BaseModel):
     qontract_api_worker_debugger_port: int = 5680
 
     # cache
-    cache_image: str = "redis:7-alpine"
+    cache_image: str = "valkey/valkey:8-alpine"
     cache_container_platform: str | None = None
     cache_compose_file: str = "cache.yml.j2"
 
@@ -149,7 +149,7 @@ class Base(BaseModel):
     default: bool = False
     root: ClassVar[Path]
 
-    def __lt__(self, other: "Base") -> bool:
+    def __lt__(self, other: Base) -> bool:
         return self.name < other.name
 
     @model_validator(mode="after")
@@ -165,7 +165,7 @@ class Base(BaseModel):
         return p.with_suffix(".yml")
 
     @classmethod
-    def list_all(cls) -> list["Base"]:
+    def list_all(cls) -> list[Base]:
         items = []
         for f in [f for f in list(cls.root.glob("**/*")) if f.is_file()]:
             items.append(  # noqa: PERF401

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/shell.py

@@ -5,15 +5,18 @@ import os
 import subprocess
 import sys
 import tempfile
-from multiprocessing import Process
 from pathlib import Path
 from shutil import which
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
-from .models import Profile
 from .templates import template
 from .utils import EndlessProcess, console
 
+if TYPE_CHECKING:
+    from multiprocessing import Process
+
+    from .models import Profile
+
 log = logging.getLogger(__name__)
 
 _docker_compose_bin = (
@@ -101,7 +104,8 @@ def compose_stop_project(project_name: str) -> None:
     for p in compose_list_projects():
         if p["Name"] == project_name:
             subprocess.run(
-                [*_docker_compose_bin, "-f", p["ConfigFiles"], "down"], check=True
+                [*_docker_compose_bin, "-f", p["ConfigFiles"].split(",")[0], "down"],
+                check=True,
             )
 
 

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/templates/cache.yml.j2

@@ -2,7 +2,6 @@ services:
   # Cache/Broker (Redis or Valkey compatible)
   cache:
     container_name: cache
-    platform: {{ profile.settings.cache_container_platform or env.settings.container_platform }}
     image: {{ profile.settings.cache_image }}
 
     ports:
@@ -10,12 +9,14 @@ services:
 
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
+      start_period: 5s
+      start_interval: 0.1s
       interval: 5s
       timeout: 3s
       retries: 5
 
     volumes:
-    - cache_data:/data
+    - cache_data_valkey:/data
 
 volumes:
-  cache_data:
+  cache_data_valkey:

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/templates/compose.override.yml.j2

@@ -17,12 +17,15 @@ services:
     depends_on:
       cache:
         condition: service_healthy
+
+    links:
+    - cache
     {% endif %}
 {% endif %}
 
 
-{% if env.settings.run_qontract_api_worker %}
-  qontract-api-worker:
+{% if env.settings.run_qontract_api_subscriber %}
+  qontract-api-subscriber:
     networks:
     - qontract-development
 
@@ -30,9 +33,23 @@ services:
     depends_on:
       cache:
         condition: service_healthy
+
+    links:
+    - cache
     {% endif %}
+{% endif %}
+
+
+{% if env.settings.run_qontract_api_worker %}
+  qontract-api-worker:
+    networks:
+    - qontract-development
 
     {% if env.settings.run_cache %}
+    depends_on:
+      cache:
+        condition: service_healthy
+
     links:
     - cache
     {% endif %}
@@ -62,21 +79,11 @@ services:
     - pki-volume:/etc/pki:z
     {% endif %}
 
-    {% if env.settings.run_qontract_api or env.settings.run_qontract_server or profile.settings.internal_redhat_ca %}
-    depends_on:
-    {% if env.settings.run_qontract_api %}
-      qontract-api:
-        condition: service_healthy
-    {% endif %}
-    {% if env.settings.run_qontract_server %}
-      qontract-server:
-        condition: service_healthy
-    {% endif %}
     {% if profile.settings.internal_redhat_ca %}
+    depends_on:
       internal-certificates:
         condition: service_completed_successfully # Let the init container create the pki directory first
     {% endif %}
-    {% endif %}
 
     {% if env.settings.run_qontract_server or env.settings.run_qontract_api or env.settings.run_vault %}
     links:

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/templates/internal-redhat-ca.yml.j2

@@ -1,6 +1,7 @@
 services:
   internal-certificates:
     image: {{ profile.settings.internal_redhat_ca_image }}
+    pull_policy: daily
     container_name: internal-certificates
     platform: {{ profile.settings.internal_redhat_ca_container_platform or env.settings.container_platform }}
     command: |

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/templates/vault.yml.j2

@@ -3,6 +3,7 @@ services:
     container_name: vault
     platform: {{ profile.settings.vault_container_platform or env.settings.container_platform }}
     image: {{ profile.settings.vault_image }}
+    pull_policy: daily
     environment:
     - VAULT_ADDR=http://127.0.0.1:8200
     - VAULT_TOKEN=root

{qontract_development_cli-0.17.1 → qontract_development_cli-0.18.0}/qontract_development_cli/watchdog.py

@@ -1,11 +1,14 @@
 import logging
-from collections.abc import Callable, Sequence
 from multiprocessing import Process
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 from rich.logging import RichHandler
 from watchfiles import Change, DefaultFilter, watch
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Sequence
+    from pathlib import Path
+
 log = logging.getLogger(__name__)