qontract-development-cli 0.14.5__tar.gz → 0.15.2__tar.gz

qontract_development_cli-0.15.2/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Christian Assing
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/PKG-INFO

@@ -1,24 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: qontract-development-cli
-Version: 0.14.5
+Version: 0.15.2
 Summary: Helper tool for qontract-reconcile development
-Home-page: http://github.com/chassing/qontract-development-cli
+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
-Author: Christian Assing
-Author-email: cassing@redhat.com
-Requires-Python: >=3.11,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: Jinja2 (>=3.1.2,<4.0.0)
-Requires-Dist: PyYAML (>=6.0.1,<7.0.0)
-Requires-Dist: appdirs (>=1.4.4,<2.0.0)
-Requires-Dist: getkey (>=0.6.5,<0.7.0)
-Requires-Dist: pydantic (>=1.10.2,<2.0.0)
-Requires-Dist: rich (>=13.7.0,<14.0.0)
-Requires-Dist: typer (>=0.9.0,<0.10.0)
-Requires-Dist: watchfiles (>=0.21.0,<0.22.0)
-Project-URL: Repository, http://github.com/chassing/qontract-development-cli
+Requires-Python: >=3.11
+Requires-Dist: appdirs~=1.4.4
+Requires-Dist: getkey~=0.6.5
+Requires-Dist: jinja2~=3.1
+Requires-Dist: pydantic-settings~=2.6
+Requires-Dist: pydantic~=2.9
+Requires-Dist: pyyaml~=6.0.2
+Requires-Dist: rich~=13.9
+Requires-Dist: typer~=0.12.5
+Requires-Dist: watchfiles~=0.24.0
 Description-Content-Type: text/markdown
 
 # Qontract Development CLI
@@ -31,7 +29,21 @@ Qontract Development CLI supports your daily [qontract-reconcile][qontract-recon
 
 [toc]
 
-## Installation
+## Recommended Installation Method
+
+The recommended way to install `qontract-development-cli` is to use the [uv](https://docs.astral.sh/uv/) tool:
+
+```shell
+uv tool install qontract-development-cli
+```
+
+and upgrade an existing installation with:
+
+```shell
+uv tool upgrade qontract-development-cli
+```
+
+## Alternative Installation Methods
 
 You can install this library from [PyPI][pypi-link] with `pip`:
 
@@ -39,16 +51,16 @@ You can install this library from [PyPI][pypi-link] with `pip`:
 python3 -m pip install qontract-development-cli
 ```
 
-Or install it with `pipx`:
+or install it with `pipx`:
 
 ```shell
 pipx install qontract-development-cli
 ```
 
-You can also use `pipx` to run the library without installing it:
+and upgrade an existing installation with:
 
 ```shell
-pipx run qontract-development-cli
+pipx upgrade qontract-development-cli
 ```
 
 ## Quickstart
@@ -251,4 +263,3 @@ Running this profile will:
 [pypi-link]:                https://pypi.org/project/qontract-development-cli/
 [pypi-platforms]:           https://img.shields.io/pypi/pyversions/qontract-development-cli
 [qontract-reconcile]:       https://github.com/app-sre/qontract-reconcile
-

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/README.md

@@ -8,7 +8,21 @@ Qontract Development CLI supports your daily [qontract-reconcile][qontract-recon
 
 [toc]
 
-## Installation
+## Recommended Installation Method
+
+The recommended way to install `qontract-development-cli` is to use the [uv](https://docs.astral.sh/uv/) tool:
+
+```shell
+uv tool install qontract-development-cli
+```
+
+and upgrade an existing installation with:
+
+```shell
+uv tool upgrade qontract-development-cli
+```
+
+## Alternative Installation Methods
 
 You can install this library from [PyPI][pypi-link] with `pip`:
 
@@ -16,16 +30,16 @@ You can install this library from [PyPI][pypi-link] with `pip`:
 python3 -m pip install qontract-development-cli
 ```
 
-Or install it with `pipx`:
+or install it with `pipx`:
 
 ```shell
 pipx install qontract-development-cli
 ```
 
-You can also use `pipx` to run the library without installing it:
+and upgrade an existing installation with:
 
 ```shell
-pipx run qontract-development-cli
+pipx upgrade qontract-development-cli
 ```
 
 ## Quickstart

qontract_development_cli-0.15.2/pyproject.toml

@@ -0,0 +1,101 @@
+[project]
+name = "qontract-development-cli"
+version = "0.15.2"
+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"
+dependencies = [
+    "appdirs ~=1.4.4",
+    "getkey ~=0.6.5",
+    "jinja2 ~=3.1",
+    "pydantic ~=2.9",
+    "pydantic-settings ~=2.6",
+    "pyyaml ~=6.0.2",
+    "rich ~=13.9",
+    "typer ~=0.12.5",
+    "watchfiles ~=0.24.0",
+]
+
+[dependency-groups]
+dev = ["mypy ~=1.13", "ruff ~=0.7", "types-pyyaml ~=6.0"]
+[project.urls]
+homepage = "http://github.com/chassing/qontract-development-cli"
+repository = "http://github.com/chassing/qontract-development-cli"
+documentation = "http://github.com/chassing/qontract-development-cli"
+
+[project.scripts]
+qd = "qontract_development_cli.__main__:app"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.sdist]
+only-include = ["qontract_development_cli"]
+
+[tool.mypy]
+plugins = "pydantic.mypy"
+enable_error_code = "truthy-bool, redundant-expr"
+no_implicit_optional = true
+check_untyped_defs = true
+warn_unused_ignores = true
+show_error_codes = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+
+[[tool.mypy.overrides]]
+module = ["getkey.*", "appdirs.*"]
+ignore_missing_imports = true
+
+[tool.ruff]
+line-length = 88
+target-version = 'py311'
+src = ["qontract_development_cli"]
+extend-exclude = [".local", ".cache"]
+fix = true
+
+[tool.ruff.lint]
+preview = true
+select = ["ALL"]
+ignore = [
+    "ANN401", # Disallow *args, **kwargs with ANY
+    "ARG003", # Unusable arguments
+    "CPY",    # Missing copyright header
+    "D10",    # docstrings
+    "D203",   # 1 blank line required before class docstring
+    "D211",   # No blank lines allowed before class docstring
+    "D212",   # multi-line-summary-first-line
+    "D213",   # multi-line-summary-second-line
+    "D4",     # Doc string style
+    "E501",   # Line too long
+    "G004",   # Logging statement uses string formatting
+    "S101",   # Use of assert detected. Pytest uses assert
+    "EM101",
+    "EM102",
+    "S404",   # subprocess possibly insecure
+    "S603",   # subprocess check user input
+    "S607",   # subprocess partical executable path
+    "TID252", # relative imports
+    "TRY003",
+    # pydoclint
+    "DOC",
+    # May conflict with the formatter, https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+    "W191",
+    "E111",
+    "E114",
+    "E117",
+    "D206",
+    "D300",
+    "Q",
+    "COM812",
+    "COM819",
+    "ISC001",
+]
+
+[tool.ruff.format]
+preview = true
+
+[tool.ruff.lint.isort]
+known-first-party = ["qontract_development_cli"]

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/cli.py

@@ -1,21 +1,18 @@
 import atexit
 import logging
 import sys
+from importlib.metadata import version
 from pathlib import Path
+from typing import Annotated
 
 import typer
+from rich import print as rich_print
 from rich.logging import RichHandler
 
 from .commands import config as config_cmd
-from .commands import (
-    env,
-    profile,
-)
+from .commands import env, profile
 from .config import config
-from .utils import (
-    console,
-    screenshot,
-)
+from .utils import console, screenshot
 
 app = typer.Typer()
 app.add_typer(env.app, name="env", help="Environment related commands.")
@@ -25,10 +22,20 @@ app.add_typer(
 app.add_typer(profile.app, name="profile", help="Profile related commands.")
 
 
+def version_callback(value: bool) -> None:  # noqa: FBT001
+    if value:
+        rich_print(f"Version: {version('qontract-development-cli')}")
+        raise typer.Exit
+
+
 @app.callback(no_args_is_help=True)
 def main(
-    debug: bool = typer.Option(False, help="Enable debug"),
-    screen_capture_file: Path = typer.Option(None, writable=True),
+    *,
+    debug: Annotated[bool, typer.Option(help="Enable debug")] = False,
+    screen_capture_file: Annotated[Path | None, typer.Option(writable=True)] = None,
+    version: Annotated[  # noqa: ARG001
+        bool | None, typer.Option(callback=version_callback, help="Display version")
+    ] = None,
 ) -> None:
     logging.basicConfig(
         level="DEBUG" if config.debug or debug else "INFO",
@@ -37,7 +44,7 @@ def main(
         handlers=[RichHandler()],
     )
     if screen_capture_file is not None:
-        print(f"Screen recording: {screen_capture_file}")
+        rich_print(f"Screen recording: {screen_capture_file}")
         # strip $0 and screen_capture_file option
         args = sys.argv[3:]
         console.print(f"$ qd {' '.join(args)}")

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/commands/config.py

@@ -5,14 +5,8 @@ from pathlib import Path
 import typer
 from rich.prompt import Prompt
 
-from ..config import (
-    config,
-    user_config_file,
-)
-from ..models import (
-    DEFAULT_PROFILE,
-    Env,
-)
+from ..config import config, user_config_file
+from ..models import DEFAULT_PROFILE, Env
 from ..utils import console
 
 app = typer.Typer()

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/commands/env.py

@@ -1,5 +1,6 @@
 import logging
 import subprocess
+from typing import Annotated
 
 import typer
 from rich.prompt import Confirm
@@ -14,7 +15,9 @@ log = logging.getLogger(__name__)
 
 
 @app.command()
-def edit(env_name: str = typer.Argument(..., help="Env to edit or create.")) -> None:
+def edit(
+    env_name: Annotated[str, typer.Argument(help="Env to edit or create.")],
+) -> None:
     """Create/edit an environment file in your editor."""
     env = Env(name=env_name)
     console.print(f"Opening [b]{env.name}[/] in your editor ...")
@@ -32,9 +35,9 @@ def ls() -> None:
 
 @app.command()
 def rm(
-    env_name: str = typer.Argument(
-        ..., help="Environment to remove.", autocompletion=complete_env
-    ),
+    env_name: Annotated[
+        str, typer.Argument(help="Environment to remove.", autocompletion=complete_env)
+    ],
 ) -> None:
     """Remove environment."""
     env = Env(name=env_name)
@@ -44,9 +47,9 @@ def rm(
 
 @app.command()
 def show(
-    env_name: str = typer.Argument(
-        ..., help="Environment to display.", autocompletion=complete_env
-    ),
+    env_name: Annotated[
+        str, typer.Argument(help="Environment to display.", autocompletion=complete_env)
+    ],
 ) -> None:
     """Display environment."""
     env = Env(name=env_name)

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/commands/profile.py

@@ -1,16 +1,13 @@
+# noqa: A005 - profile is shadowing python built-in 'profile'
 import logging
 import subprocess
 import tempfile
-from multiprocessing import Process
 from pathlib import Path
-from typing import Optional
+from typing import TYPE_CHECKING, Annotated
 
 import typer
 from getkey import getkey
-from rich.prompt import (
-    Confirm,
-    Prompt,
-)
+from rich.prompt import Confirm, Prompt
 from rich.table import Table
 
 from qontract_development_cli.watchdog import watch_files
@@ -37,57 +34,67 @@ 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__)
 
-# see https://github.com/tiangolo/typer/issues/533
-OptionalStr = Optional[str]  # noqa: UP007
-OptionalInt = Optional[int]  # noqa: UP007
-OptionalPath = Optional[Path]  # noqa: UP007
-
 
 @app.command()
 def create(  # noqa: PLR0913, PLR0917
     profile_name: str = typer.Argument(..., help="Profile to create."),
-    integration_name: OptionalStr = typer.Option(None),
-    integration_extra_args: OptionalStr = typer.Option(None),
-    app_interface: OptionalPath = typer.Option(
-        None,
-        file_okay=False,
-        dir_okay=True,
-        readable=True,
-        resolve_path=True,
-        exists=True,
-        help="Path to local app-interface instance git working copy.",
-    ),
-    app_interface_pr: OptionalInt = typer.Option(None, help="PR/MR to use"),
-    app_interface_upstream: str = typer.Option("upstream", help="Upstream remote name"),
-    qontract_schemas: OptionalPath = typer.Option(
-        None,
-        file_okay=False,
-        dir_okay=True,
-        readable=True,
-        resolve_path=True,
-        exists=True,
-        help="Path to local qontract-schemas git working copy.",
-    ),
-    qontract_schemas_pr: OptionalInt = typer.Option(None, help="PR/MR to use"),
-    qontract_schemas_upstream: str = typer.Option(
-        "upstream", help="Upstream remote name"
-    ),
-    qontract_reconcile: OptionalPath = typer.Option(
-        None,
-        file_okay=False,
-        dir_okay=True,
-        readable=True,
-        resolve_path=True,
-        exists=True,
-        help="Path to local qontract-reconcile git working copy.",
-    ),
-    qontract_reconcile_pr: OptionalInt = typer.Option(None, help="PR/MR to use"),
-    qontract_reconcile_upstream: str = typer.Option(
-        "upstream", help="Upstream remote name"
-    ),
+    integration_name: Annotated[str | None, typer.Option()] = None,
+    integration_extra_args: Annotated[str | None, typer.Option()] = None,
+    app_interface: Annotated[
+        Path | None,
+        typer.Option(
+            file_okay=False,
+            dir_okay=True,
+            readable=True,
+            resolve_path=True,
+            exists=True,
+            help="Path to local app-interface instance git working copy.",
+        ),
+    ] = None,
+    app_interface_pr: Annotated[int | None, typer.Option(help="PR/MR to use")] = None,
+    app_interface_upstream: Annotated[
+        str, typer.Option(help="Upstream remote name")
+    ] = "upstream",
+    qontract_schemas: Annotated[
+        Path | None,
+        typer.Option(
+            file_okay=False,
+            dir_okay=True,
+            readable=True,
+            resolve_path=True,
+            exists=True,
+            help="Path to local qontract-schemas git working copy.",
+        ),
+    ] = None,
+    qontract_schemas_pr: Annotated[
+        int | None, typer.Option(help="PR/MR to use")
+    ] = None,
+    qontract_schemas_upstream: Annotated[
+        str, typer.Option(help="Upstream remote name")
+    ] = "upstream",
+    qontract_reconcile: Annotated[
+        Path | None,
+        typer.Option(
+            file_okay=False,
+            dir_okay=True,
+            readable=True,
+            resolve_path=True,
+            exists=True,
+            help="Path to local qontract-reconcile git working copy.",
+        ),
+    ] = None,
+    qontract_reconcile_pr: Annotated[
+        int | None, typer.Option(help="PR/MR to use")
+    ] = None,
+    qontract_reconcile_upstream: Annotated[
+        str, typer.Option(help="Upstream remote name")
+    ] = "upstream",
 ) -> None:
     """Create a new profile to run an integration."""
     if profile_name in [p.name for p in Profile.list_all()]:
@@ -132,9 +139,9 @@ def create(  # noqa: PLR0913, PLR0917
 
 @app.command()
 def edit(
-    profile_name: str = typer.Argument(
-        ..., help="Profile to edit.", autocompletion=complete_profile
-    ),
+    profile_name: Annotated[
+        str, typer.Argument(help="Profile to edit.", autocompletion=complete_profile)
+    ],
 ) -> None:
     """Edit a profile in your editor."""
     profile = Profile(name=profile_name)
@@ -153,10 +160,13 @@ def ls() -> None:
 
 @app.command()
 def rm(
-    profile_name: str = typer.Argument(
-        ..., help="Profile to remove.", autocompletion=complete_profile
-    ),
-    force: bool = typer.Option(False, "--force", "-f", help="Do not ask any question."),
+    profile_name: Annotated[
+        str, typer.Argument(help="Profile to remove.", autocompletion=complete_profile)
+    ],
+    *,
+    force: Annotated[
+        bool, typer.Option("--force", "-f", help="Do not ask any question.")
+    ] = False,
 ) -> None:
     """Remove profile."""
     profile = Profile(name=profile_name)
@@ -178,47 +188,53 @@ def show(
 
 
 @app.command(no_args_is_help=True)
-def run(  # noqa: PLR0912, PLR0917, PLR0913, PLR0915
-    env_name: str = typer.Argument(
-        ..., help="Environment to use.", autocompletion=complete_env
-    ),
-    profile_name: str = typer.Argument(
-        ..., help="Profile to run.", autocompletion=complete_profile
-    ),
-    force_recreate: bool = typer.Option(False, help="Recreate all containers."),
-    force_build: bool = typer.Option(False, help="Rebuild all containers."),
-    qontract_reconcile_monitor_file_changes: bool = typer.Option(
-        True,
-        help="Restart integration when files changed in qontract-reconcile path",
-    ),
-    qontract_reconcile_monitor_file_extensions: str = typer.Option(
-        ".py .pyx .pyd",
-        help="Monitor these file extensions",
-    ),
-    qontract_schemas_monitor_file_changes: bool = typer.Option(
-        True,
-        help="Rebuild bundle and restart qontract-server when files changed in qontract-schemas path",
-    ),
-    qontract_schemas_monitor_file_extensions: str = typer.Option(
-        ".json .yml .yaml",
-        help="Monitor these file extensions",
-    ),
-    app_interface_monitor_file_changes: bool = typer.Option(
-        True,
-        help="Rebuild bundle and restart qontract-server when files changed in app-interface path",
-    ),
-    app_interface_monitor_file_extensions: str = typer.Option(
-        ".json .yml .yaml",
-        help="Monitor these file extensions",
-    ),
-    skip_initial_make_bundle: bool = typer.Option(
-        False,
-        help="Do not run 'make bundle' before starting the integration",
-    ),
-    no_dry_run: bool = typer.Option(
-        False,
-        help="Disable dry-run mode",
-    ),
+def run(  # noqa: C901, PLR0912, PLR0913, PLR0915
+    env_name: Annotated[
+        str, typer.Argument(help="Environment to use.", autocompletion=complete_env)
+    ],
+    profile_name: Annotated[
+        str, typer.Argument(help="Profile to run.", autocompletion=complete_profile)
+    ],
+    *,
+    force_recreate: Annotated[
+        bool, typer.Option(help="Recreate all containers.")
+    ] = False,
+    force_build: Annotated[bool, typer.Option(help="Rebuild all containers.")] = False,
+    qontract_reconcile_monitor_file_changes: Annotated[
+        bool,
+        typer.Option(
+            help="Restart integration when files changed in qontract-reconcile path"
+        ),
+    ] = True,
+    qontract_reconcile_monitor_file_extensions: Annotated[
+        str, typer.Option(help="Monitor these file extensions")
+    ] = ".py .pyx .pyd",
+    qontract_schemas_monitor_file_changes: Annotated[
+        bool,
+        typer.Option(
+            help="Rebuild bundle and restart qontract-server when files changed in qontract-schemas path"
+        ),
+    ] = True,
+    qontract_schemas_monitor_file_extensions: Annotated[
+        str, typer.Option(help="Monitor these file extensions")
+    ] = ".json .yml .yaml",
+    app_interface_monitor_file_changes: Annotated[
+        bool,
+        typer.Option(
+            help="Rebuild bundle and restart qontract-server when files changed in app-interface path"
+        ),
+    ] = True,
+    app_interface_monitor_file_extensions: Annotated[
+        str, typer.Option(help="Monitor these file extensions")
+    ] = ".json .yml .yaml",
+    skip_initial_make_bundle: Annotated[
+        bool,
+        typer.Option(help="Do not run 'make bundle' before starting the integration"),
+    ] = False,
+    no_dry_run: Annotated[
+        bool,
+        typer.Option(help="Disable dry-run mode"),
+    ] = False,
 ) -> None:
     """Run a profile."""
     env = Env(name=env_name)

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/completions.py

@@ -1,7 +1,4 @@
-from .models import (
-    Env,
-    Profile,
-)
+from .models import Env, Profile
 
 
 def complete_env() -> list[str]:

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/config.py

@@ -1,10 +1,14 @@
 import os
 import platform
 from pathlib import Path
-from typing import Any
 
-from appdirs import AppDirs  # type: ignore
-from pydantic import BaseSettings
+from appdirs import AppDirs
+from pydantic_settings import (
+    BaseSettings,
+    PydanticBaseSettingsSource,
+    SettingsConfigDict,
+    YamlConfigSettingsSource,
+)
 
 from .utils import yaml
 
@@ -20,14 +24,6 @@ user_cache_dir.mkdir(parents=True, exist_ok=True)
 is_mac = platform.system().lower() == "darwin"
 
 
-def yaml_config_settings_source(settings: BaseSettings) -> dict[str, Any]:
-    encoding = settings.__config__.env_file_encoding
-    if user_config_file.exists():
-        cfg = yaml.safe_load(user_config_file.read_text(encoding))
-        return cfg if cfg else {}
-    return {}
-
-
 class Config(BaseSettings):
     debug: bool = False
     defaults_profile: str = "defaults"
@@ -37,31 +33,41 @@ class Config(BaseSettings):
     profiles_dir: Path = user_config_dir / "profiles"
     worktrees_dir: Path = user_cache_dir / "worktrees"
 
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(self) -> None:
+        super().__init__()
         self.environments_dir.mkdir(parents=True, exist_ok=True)
         self.profiles_dir.mkdir(parents=True, exist_ok=True)
 
-    class Config:
-        extra = "ignore"
-        env_file_encoding = "utf-8"
-        env_prefix = "qontract_development_"
+    @classmethod
+    def settings_customise_sources(
+        cls,
+        settings_cls: type[BaseSettings],
+        init_settings: PydanticBaseSettingsSource,
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
+        file_secret_settings: PydanticBaseSettingsSource,
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
+        return (
+            init_settings,
+            env_settings,
+            YamlConfigSettingsSource(settings_cls),
+        )
 
-        @classmethod
-        def customise_sources(
-            cls, init_settings: Any, env_settings: Any, file_secret_settings: Any
-        ) -> tuple:
-            return (init_settings, env_settings, yaml_config_settings_source)
+    model_config = SettingsConfigDict(
+        yaml_file=user_config_file,
+        yaml_file_encoding="utf-8",
+        env_prefix="qontract_development_",
+    )
 
     def save(self) -> None:
         user_config_file.write_text(
             yaml.dump(
-                self.dict(),
+                self.model_dump(),
                 explicit_start=True,
                 indent=4,
                 default_flow_style=False,
             ),
-            encoding=self.__config__.env_file_encoding,
+            encoding=self.model_config["yaml_file_encoding"],
         )
 
 

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/models.py

@@ -1,12 +1,10 @@
+import contextlib
 import copy
 import os
 from pathlib import Path
-from typing import Any
+from typing import Any, ClassVar, Self
 
-from pydantic import (
-    BaseModel,
-    validator,
-)
+from pydantic import BaseModel, model_validator
 
 from .config import config
 from .utils import yaml
@@ -24,12 +22,12 @@ class EnvSettings(BaseModel):
 
 
 class ProfileSettings(BaseModel):
-    command: str = "dockerfiles/hack/run-integration.py"
+    command: str = "run-integration"
     command_extra_args: str = ""
     container_uid: int = os.getuid()
     debugger: str = "debugpy"
     dry_run: bool = True
-    integration_extra_args: str = ""
+    integration_extra_args: str | int = ""
     integration_name: str = ""
     log_level: str = "INFO"
     app_interface_path: Path | None = None
@@ -55,39 +53,42 @@ class ProfileSettings(BaseModel):
     localstack_compose_file: Path | None
     skip_initial_make_bundle: bool = False
 
-    @validator("localstack_compose_file", always=True)
-    def default_localstack_compose_file(cls, v: Path | None, values: dict) -> Path:
-        return (
-            v
-            if v
-            else values["qontract_reconcile_path"] / "dev/localstack/docker-compose.yml"
+    @model_validator(mode="after")
+    def default_localstack_compose_file(self) -> Self:
+        self.localstack_compose_file = (
+            self.localstack_compose_file
+            or self.qontract_reconcile_path / "dev/localstack/docker-compose.yml"
         )
+        return self
 
 
 class Base(BaseModel):
     name: str
     default: bool = False
-    _root: Path
+    root: ClassVar[Path]
 
     def __lt__(self, other: "Base") -> bool:
         return self.name < other.name
 
-    @validator("name")
-    def name_remove_suffix(cls, v: str) -> str:
-        p = Path(v)
-        return str(p.parent / p.stem)
+    @model_validator(mode="after")
+    def name_remove_suffix(self) -> Self:
+        p = Path(self.name)
+        self.name = str(p.parent / p.stem)
+        return self
 
     @property
     def file(self) -> Path:
-        p = self._root / self.name
+        p = self.root / self.name
         p.parent.mkdir(parents=True, exist_ok=True)
         return p.with_suffix(".yml")
 
     @classmethod
     def list_all(cls) -> list["Base"]:
         items = []
-        for f in [f for f in list(cls._root.glob("**/*")) if f.is_file()]:
-            items.append(cls(name=str(f.relative_to(cls._root))))
+        for f in [f for f in list(cls.root.glob("**/*")) if f.is_file()]:
+            items.append(  # noqa: PERF401
+                cls(name=str(f.relative_to(cls.root)))
+            )
         return items
 
     @property
@@ -101,18 +102,18 @@ class Base(BaseModel):
     @property
     def settings_as_dict(self) -> dict[str, Any]:
         values = self.default_settings_as_dict
-        try:
+        with contextlib.suppress(FileNotFoundError):
             values.update(
                 **yaml.safe_load(
-                    self.file.read_text(encoding=config.__config__.env_file_encoding)
+                    self.file.read_text(
+                        encoding=config.model_config["yaml_file_encoding"]
+                    )
                 )
             )
-        except FileNotFoundError:
-            pass
         return values
 
     def dump(self) -> None:
-        values = self.settings.dict(  # type: ignore
+        values = self.settings.dict(  # type: ignore[attr-defined]
             exclude_defaults=not self.default, exclude_unset=not self.default
         )
         self.file.write_text(
@@ -126,7 +127,7 @@ class Base(BaseModel):
 
 
 class Env(Base):
-    _root: Path = config.environments_dir
+    root: ClassVar[Path] = config.environments_dir
     default: bool = True
     settings: EnvSettings
 
@@ -141,7 +142,7 @@ class Env(Base):
 
 
 class Profile(Base):
-    _root: Path = config.profiles_dir
+    root: ClassVar[Path] = config.profiles_dir
     settings: ProfileSettings
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -155,17 +156,17 @@ class Profile(Base):
         defaults = {
             "integration_name": "changeme",
             "integration_extra_args": "",
+            "localstack_compose_file": None,
         }
-        try:
+        with contextlib.suppress(FileNotFoundError, AttributeError, NameError):
             defaults.update(
                 yaml.safe_load(
                     DEFAULT_PROFILE.file.read_text(
-                        encoding=config.__config__.env_file_encoding
+                        encoding=config.model_config["yaml_file_encoding"]
                     )
                 )
             )
-        except (FileNotFoundError, AttributeError, NameError):
-            pass
+
         return defaults
 
     def dump(self) -> None:

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/shell.py

@@ -12,10 +12,7 @@ from typing import Any
 
 from .models import Profile
 from .templates import template
-from .utils import (
-    EndlessProcess,
-    console,
-)
+from .utils import EndlessProcess, console
 
 log = logging.getLogger(__name__)
 
@@ -26,12 +23,13 @@ _docker_compose_bin = (
 
 def compose_up(
     compose_file: Path,
+    *,
     force_recreate: bool = False,
     remove_orphan: bool = True,
     build: bool = False,
 ) -> None:
     log.info("Starting all containers")
-    compose_cmd = _docker_compose_bin + ["-f", str(compose_file), "up", "-d"]
+    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "up", "-d"]
     if force_recreate:
         compose_cmd.append("--force-recreate")
     if remove_orphan:
@@ -43,12 +41,7 @@ def compose_up(
 
 def compose_restart(compose_file: Path, container: str) -> None:
     log.info(f"Restarting {container} container")
-    compose_cmd = _docker_compose_bin + [
-        "-f",
-        str(compose_file),
-        "restart",
-        container,
-    ]
+    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "restart", container]
     subprocess.run(compose_cmd, check=True)
 
 
@@ -60,12 +53,12 @@ def container_restart(container: str) -> None:
 
 def compose_down(compose_file: Path) -> None:
     log.info("Stopping all containers")
-    compose_cmd = _docker_compose_bin + ["-f", str(compose_file), "down"]
+    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "down"]
     subprocess.run(compose_cmd, check=True)
 
 
 def compose_log_tail(compose_file: Path) -> Process:
-    compose_cmd = _docker_compose_bin + ["-f", str(compose_file), "logs", "--follow"]
+    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "logs", "--follow"]
     p = EndlessProcess(target=subprocess.run, args=(compose_cmd,))
     p.start()
     return p
@@ -74,7 +67,7 @@ def compose_log_tail(compose_file: Path) -> Process:
 def compose_list_projects() -> list[dict[str, Any]]:
     return json.loads(
         subprocess.run(
-            _docker_compose_bin + ["ls", "--format", "json"],
+            [*_docker_compose_bin, "ls", "--format", "json"],
             capture_output=True,
             check=True,
         ).stdout
@@ -86,7 +79,7 @@ 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"], "down"], check=True
             )
 
 
@@ -97,7 +90,9 @@ def make_bundle(app_interface_path: Path, qontract_server_path: Path) -> None:
         "APP_INTERFACE_PATH": str(app_interface_path.expanduser().absolute())
     })
     subprocess.run(
-        ["make", "-C", str(qontract_server_path), "bundle"], env=shell_env, check=False
+        ["make", "-C", str(qontract_server_path), "bundle"],
+        env=shell_env,
+        check=False,
     )
 
 

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/templates.py

@@ -1,16 +1,14 @@
 from pathlib import Path
 from typing import Any
 
-from jinja2 import (
-    Environment,
-    FileSystemLoader,
-)
+from jinja2 import Environment, FileSystemLoader
 
 environment = Environment(
     loader=FileSystemLoader(str(Path(__file__).parent / "templates")),
     trim_blocks=True,
     lstrip_blocks=True,
     keep_trailing_newline=True,
+    autoescape=True,
 )
 
 

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/utils.py

@@ -1,8 +1,5 @@
 from multiprocessing import Process
-from pathlib import (
-    Path,
-    PosixPath,
-)
+from pathlib import Path, PosixPath
 from typing import Any
 
 import yaml
@@ -27,6 +24,6 @@ console = Console(record=True)
 
 class EndlessProcess(Process):
     def run(self) -> None:
-        if self._target:  # type: ignore
+        if self._target:  # type: ignore[attr-defined]
             while True:
-                self._target(*self._args, **self._kwargs)  # type: ignore
+                self._target(*self._args, **self._kwargs)  # type: ignore[attr-defined]

{qontract_development_cli-0.14.5 → qontract_development_cli-0.15.2}/qontract_development_cli/watchdog.py

@@ -4,11 +4,7 @@ from multiprocessing import Process
 from pathlib import Path
 
 from rich.logging import RichHandler
-from watchfiles import (
-    Change,
-    DefaultFilter,
-    watch,
-)
+from watchfiles import Change, DefaultFilter, watch
 
 log = logging.getLogger(__name__)
 

qontract_development_cli-0.14.5/pyproject.toml

@@ -1,89 +0,0 @@
-[tool.poetry]
-name = "qontract-development-cli"
-version = "0.14.5"
-description = "Helper tool for qontract-reconcile development"
-authors = ["Christian Assing <cassing@redhat.com>"]
-license = "MIT"
-readme = "README.md"
-repository = "http://github.com/chassing/qontract-development-cli"
-homepage = "http://github.com/chassing/qontract-development-cli"
-
-[tool.poetry.dependencies]
-python = ">=3.11,<4.0"
-Jinja2 = "^3.1.2"
-typer = "^0.9.0"
-rich = "^13.7.0"
-pydantic = "^1.10.2"
-appdirs = "^1.4.4"
-PyYAML = "^6.0.1"
-getkey = "^0.6.5"
-watchfiles = "^0.21.0"
-
-[tool.poetry.dev-dependencies]
-types-PyYAML = "^6.0.12"
-
-[tool.poetry.group.dev.dependencies]
-pytest = "^8.0.0"
-mypy = "^1.8.0"
-types-pyyaml = "^6.0.12.11"
-ruff = "^0.4.8"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.scripts]
-qd = "qontract_development_cli.__main__:app"
-
-[tool.mypy]
-plugins = "pydantic.mypy"
-enable_error_code = "truthy-bool, redundant-expr"
-no_implicit_optional = true
-check_untyped_defs = true
-warn_unused_ignores = true
-show_error_codes = true
-disallow_untyped_defs = true
-disallow_incomplete_defs = true
-
-[[tool.mypy.overrides]]
-module = ["getkey.*"]
-ignore_missing_imports = true
-
-[tool.commitizen]
-name = "cz_conventional_commits"
-version = "0.11.1"
-version_files = ["pyproject.toml:version"]
-update_changelog_on_bump = true
-major_version_zero = true
-change_type_map = { "feat" = "Features", "fix" = "Bug Fixes" }
-tag_format = "v$version"
-
-[tool.ruff]
-line-length = 88
-target-version = 'py311'
-required-version = "0.4.8"
-src = ["qontract_development_cli"]
-extend-exclude = [".local", ".cache"]
-fix = true
-
-[tool.ruff.lint]
-preview = true
-# defaults are ["E4", "E7", "E9", "F"]
-extend-select = [
-    # flake8 default rules
-    "E1", # preview rule
-    "E2", # preview rule
-    "W",
-    # isort
-    "I",
-    # pylint
-    "PL",
-    # pyupgrade
-    "UP",
-]
-
-[tool.ruff.format]
-preview = true
-
-[tool.ruff.lint.isort]
-known-first-party = ["qontract_development_cli"]

qontract_development_cli-0.14.5/setup.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['qontract_development_cli', 'qontract_development_cli.commands']
-
-package_data = \
-{'': ['*'], 'qontract_development_cli': ['templates/*']}
-
-install_requires = \
-['Jinja2>=3.1.2,<4.0.0',
- 'PyYAML>=6.0.1,<7.0.0',
- 'appdirs>=1.4.4,<2.0.0',
- 'getkey>=0.6.5,<0.7.0',
- 'pydantic>=1.10.2,<2.0.0',
- 'rich>=13.7.0,<14.0.0',
- 'typer>=0.9.0,<0.10.0',
- 'watchfiles>=0.21.0,<0.22.0']
-
-entry_points = \
-{'console_scripts': ['qd = qontract_development_cli.__main__:app']}
-
-setup_kwargs = {
-    'name': 'qontract-development-cli',
-    'version': '0.14.5',
-    'description': 'Helper tool for qontract-reconcile development',
-    'long_description': "# Qontract Development CLI\n\n[![PyPI](https://img.shields.io/pypi/v/qontract-development-cli)][pypi-link]\n[![PyPI platforms][pypi-platforms]][pypi-link]\n![PyPI - License](https://img.shields.io/pypi/l/qontract-development-cli)\n\nQontract Development CLI supports your daily [qontract-reconcile][qontract-reconcile] development work.\n\n[toc]\n\n## Installation\n\nYou can install this library from [PyPI][pypi-link] with `pip`:\n\n```shell\npython3 -m pip install qontract-development-cli\n```\n\nOr install it with `pipx`:\n\n```shell\npipx install qontract-development-cli\n```\n\nYou can also use `pipx` to run the library without installing it:\n\n```shell\npipx run qontract-development-cli\n```\n\n## Quickstart\n\n* Create initial configuration\n\n  ```shell\n  qd config init\n  ```\n\n  ![qd init](/demo/qd_config_init.gif)\n\n* Create a profile `sql-query` to run the `sql-query` integration\n\n  ```shell\n  qd profile create sql-query\n  ```\n\n  ![qd profile create](/demo/qd_profile_create.gif)\n\n* Run `sql-query` profile\n\n  ```shell\n  qd profile run dev sql-query\n  ```\n\n  ![qd sql_query](/images/profile_run_sql_query.svg)\n\n## Features\n\nQontract Development CLI currently provides the following features (get help with `-h` or `--help`):\n\n* Run `qontract-reconcile` and `qontract-server` as docker containers on your local machine\n* Support for different App-Interface environments (dev, prod, ...) via the `env` command\n* Configure your [qontract-reconcile integration][qontract-reconcile] with the `profile` command\n* Support pull request reviews (see `profile create`)\n* Bootstrap your initial configurations with the `config` command\n* Shell auto-completion (see `qd --help`)\n* Automatically restart `qontract-reconcile` container when files change\n* Automatically rebuild the App-Interface bundle and restart the `qontract-server` container when files change\n\n## Examples\n\nTake a look at the [examples](examples) directory for different profile examples.\n\n## Usage\n\nThe following sections describe all available commands and their options.\n\n### Config\n\nManage global qontract-development-cli configuration.\n\n`qd config [sub-cmd] --help`\n\n* **edit**: open the configuration file in your favorite editor\n* **init**: create a default configuration\n\n#### Global Settings\n\n| **Key**                     | **Description**                       | **Default**                          |\n| --------------------------- | ------------------------------------- | ------------------------------------ |\n| debug                       | Enable/disable debug mode             | false                                |\n| defaults_profile            | Name of defaults profile              | defaults                             |\n| docker_compose_project_name | Docker compose project name           | qontract-development                 |\n| editor                      | Your favorite editor                  | $EDITOR or vim                       |\n| environments_dir            | Directory to store environment files  | User config directory / environments |\n| profiles_dir                | Directory to store profile files      | User config directory / profiles     |\n| worktrees_dir               | Directory to store git repo worktrees | User cache directory / worktrees     |\n\n### Environments\n\nAn environment specifies app-interface instance settings, e.g., **dev** vs. **prod** config and path to the actual app-interface instance.\n\n`qd env [sub-cmd] --help`\n\n* **edit**: Create/edit an environment file in your editor.\n* **ls**: List all available environments.\n* **rm**: Remove environment.\n* **show**: Display environment.\n\n#### Environment Settings\n\n| **Key**                            | **Description**                      | **Default**                                    |\n| ---------------------------------- | ------------------------------------ | ---------------------------------------------- |\n| **app_interface_path**             | Path to local app-interface instance | ~/workspace/app-interface                      |\n| app_interface_state_bucket         | S3 bucket                            | empty                                          |\n| app_interface_state_bucket_account | AWS S3 account                       | empty                                          |\n| **config**                         | app-interface config                 | ~/workspace/qontract-reconcile/config.dev.toml |\n| gitlab_pr_submitter_queue_url      | Gitlab pr submitter queue url        |                                                |\n| run_qontract_reconcile             | Run qontract-reconcile container     | true                                           |\n| run_qontract_server                | Run qontract-server container        | true                                           |\n| run_vault                          | Run vault container                  | false                                          |\n\n> :point_right: **Bold keys** are mandatory or should be customized.\n\n### Profiles\n\nA profile specifies all settings to run a qontract-reconcile integration (e.g., *sql-query*).\n\n`qd profile [sub-cmd] --help`\n\n* **create**: Create a new profile to run an integration.\n\n  Supports the creation of a new profile from an open PR/MR. See `$ qd profile create --help` for all available options.\n\n* **edit**: Edit a profile in your editor.\n* **ls**: List all available profiles.\n* **rm**: Remove profile.\n* **run**: Run a profile.\n* **show**: Display profile.\n\n#### --no-dry-run\n\nBy default, `qd` runs integrations in `dry-run` mode if not explicitly specified differently in the profile config.\nThere is also a `--no-dry-run` flag which lets you disable `dry-run` mode from the command line.\n\n```shell\nqd profile run dev my-integration --no-dry-run\n```\n\nThe command line flag takes precedence over any configuration you might have in the profile settings.\n\n#### Profile Settings\n\n| **Key**                        | **Description**                                                                                                                                                              | **Default**                                                  |\n| ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------ |\n| additional_environment         | Dictionary of additional environment variables to pass to the qontract-reconcile container                                                                                   | `{}`                                                         |\n| container_uid                  | Change ownership of /recconcile files in container to this user id                                                                                                           | current UID                                                  |\n| command                        | Command to run in the qontract-reconcile container.                                                                                                                          | `dockerfiles/hack/run-integration.py`                        |\n| command_extra_args             | Additional arguments to pass to the command.                                                                                                                                 |                                                              |\n| debugger                       | Python debugger                                                                                                                                                              | `debugpy`                                                    |\n| dry_run                        | Run --dry-run mode                                                                                                                                                           | `true`                                                       |\n| extra_hosts                    | List of 'HOSTNAME:IP' mapping entries for qontract-reconcile `/etc/hosts`. See [extra_hosts](https://docs.docker.com/compose/compose-file/#extra_hosts) docker compose file. | `[]`                                                         |\n| **integration_name**           | Intergration name                                                                                                                                                            |                                                              |\n| **integration_extra_args**     | Intergration extra arguments                                                                                                                                                 |                                                              |\n| **internal_redhat_ca**         | Inject Red Hat internal CAs and `REQUESTS_CA_BUNDLE` environment variable                                                                                                    | `false`                                                      |\n| log_level                      | Log level                                                                                                                                                                    | `info`                                                       |\n| app_interface_path             | App-interface instance path. (Overrides *env.app_interface_path*)                                                                                                            |                                                              |\n| app_interface_pr               | App-interface PR/MR number                                                                                                                                                   |                                                              |\n| app_interface_upstream         | Upstream remote name                                                                                                                                                         | `upstream`                                                   |\n| qontract_reconcile_build_image | Build qontract-reconcile image                                                                                                                                               | `true`                                                       |\n| qontract_reconcile_image       | Qontract-reconcile image                                                                                                                                                     | `quay.io/app-sre/qontract-reconcile:latest`                  |\n| qontract_reconcile_path        | Qontract-reconcile path                                                                                                                                                      | `~/workspace/qontract-reconcile`                             |\n| qontract_reconcile_pr          | Qontract-reconcile PR/MR number                                                                                                                                              |                                                              |\n| qontract_reconcile_upstream    | Upstream remote name                                                                                                                                                         | `upstream`                                                   |\n| qontract_server_build_image    | Build qontract-server image                                                                                                                                                  | `true`                                                       |\n| qontract_server_image          | Qontract-server image                                                                                                                                                        | `quay.io/app-sre/qontract-server:lates`t                     |\n| qontract_server_path           | Qontract-server path                                                                                                                                                         | `~/workspace/qontract-server`                                |\n| qontract_schemas_path          | Qontract-schemas path                                                                                                                                                        | `~/workspace/qontract-schemas`                               |\n| qontract_schemas_pr            | Qontract-schemas PR/MR number                                                                                                                                                |                                                              |\n| qontract_schemas_upstream      | Upstream remote name                                                                                                                                                         | `upstream`                                                   |\n| run_once                       | If 'true', execute the integration once and exit                                                                                                                             | `true`                                                       |\n| sleep_duration_secs            | If not *run_once*, sleep duration until integration runs again                                                                                                               | `10`                                                         |\n| localstack                     | Run localstack container and set AWS related environment variables                                                                                                           | `false`                                                      |\n| localstack_compose_file        | Path to your Localstack docker-compose file                                                                                                                                  | `qontract_server_path` / `dev/localstack/docker-compose.yml` |\n| skip_initial_make_bundle       | Skip initial make bundle step                                                                                                                                                | `false`                                                      |\n\n> :point_right: **Bold keys** are mandatory or should be customized.\n\n### PR/MR support\n\nIt's a pretty handy feature to create a profile from a pull request (merge request). E.g.:\n\n```shell\nqd profile create --app-interface PATH_TO_YOUR_LOCAL/app-interface-dev-data --app-interface-pr NUMBER --qontract-schemas-pr NUMBER --qontract-reconcile-pr NUMBER --integration-name glitchtip --integration-extra-args '' glitchtip-pr-check\n```\n\nWhich results in this profile:\n\n```shell\n$ qd profile show glitchtip-pr-check\n---\napp_interface_path: PATH_TO_YOUR_LOCAL/app-interface-dev-data\napp_interface_pr: NUMBER\nintegration_name: glitchtip\nqontract_reconcile_pr: NUMBER\nqontract_schemas_pr: NUMBER\n```\n\nRunning this profile will:\n\n* Create new git worktrees (see `config.worktrees_dir`) for app-interface-dev-data, qontract-schema, and qontract-reconcile PRs\n* Start the containers with the adapted path to these worktrees\n* Restarting the profile will fetch PR updates\n\n> :point_right: A git worktree cleanup isn't implemented yet\n\n## Development\n\n[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)\n[![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)\n\n### Release\n\n* Bump the version in `pyproject.toml`\n* Update the `CHANGELOG.md`\n* Commit the changes\n\n[pypi-link]:                https://pypi.org/project/qontract-development-cli/\n[pypi-platforms]:           https://img.shields.io/pypi/pyversions/qontract-development-cli\n[qontract-reconcile]:       https://github.com/app-sre/qontract-reconcile\n",
-    'author': 'Christian Assing',
-    'author_email': 'cassing@redhat.com',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'http://github.com/chassing/qontract-development-cli',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'entry_points': entry_points,
-    'python_requires': '>=3.11,<4.0',
-}
-
-
-setup(**setup_kwargs)