c2cciutils 1.8.0.dev68__tar.gz → 1.9.0.dev29__tar.gz

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2025, Camptocamp SA
+Copyright (c) 2020-2026, Camptocamp SA
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/PKG-INFO

@@ -1,29 +1,28 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: c2cciutils
-Version: 1.8.0.dev68
+Version: 1.9.0.dev29
 Summary: Common utilities for Camptocamp CI
 License: FreeBSD
+License-File: LICENSE
 Keywords: ci
 Author: Camptocamp
 Author-email: info@camptocamp.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.11
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
-Requires-Dist: PyYAML (==6.0.2)
-Requires-Dist: requests (==2.32.3)
-Requires-Dist: ruamel.yaml (==0.18.10)
+Requires-Dist: PyYAML (>=6,<7)
+Requires-Dist: applications-download (>=1,<2)
+Requires-Dist: requests (>=2,<3)
+Requires-Dist: ruamel.yaml (>=0,<1)
+Project-URL: Bug Tracker, https://github.com/camptocamp/c2cciutils/issues
 Project-URL: Repository, https://github.com/camptocamp/c2cciutils
 Description-Content-Type: text/markdown
 

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2020-2026, Camptocamp SA
+
 """c2cciutils shared utils function."""
 
 import json
@@ -5,7 +7,8 @@ import os.path
 import re
 import subprocess  # nosec
 import sys
-from typing import Any, Optional, cast
+from pathlib import Path
+from typing import Any, cast
 
 import requests
 import ruamel.yaml
@@ -18,7 +21,7 @@ def get_repository() -> str:
     if "GITHUB_REPOSITORY" in os.environ:
         return os.environ["GITHUB_REPOSITORY"]
 
-    remote_lines = subprocess.check_output(["git", "remote", "--verbose"]).decode().split("\n")
+    remote_lines = subprocess.check_output(["git", "remote", "--verbose"]).decode().split("\n")  # noqa: S607
     remote_match = (
         re.match(r".*git@github.com:(.*).git .*", remote_lines[0]) if len(remote_lines) >= 1 else None
     )
@@ -37,7 +40,9 @@ def get_master_branch(repo: list[str]) -> tuple[str, bool]:
     success = False
     try:
         default_branch_json = graphql(
-            "default_branch.graphql", {"name": repo[1], "owner": repo[0]}, default=False
+            "default_branch.graphql",
+            {"name": repo[1], "owner": repo[0]},
+            default=False,
         )
         success = default_branch_json is not False
         master_branch = default_branch_json["repository"]["defaultBranchRef"]["name"] if success else "master"
@@ -50,8 +55,9 @@ def get_master_branch(repo: list[str]) -> tuple[str, bool]:
 def get_config() -> c2cciutils.configuration.Configuration:
     """Get the configuration, with project and auto detections."""
     config: c2cciutils.configuration.Configuration = {}
-    if os.path.exists("ci/config.yaml"):
-        with open("ci/config.yaml", encoding="utf-8") as open_file:
+    config_path = Path("ci/config.yaml")
+    if config_path.exists():
+        with config_path.open(encoding="utf-8") as open_file:
             yaml_ = ruamel.yaml.YAML()
             config = yaml_.load(open_file)
 
@@ -61,9 +67,9 @@ def get_config() -> c2cciutils.configuration.Configuration:
 def error(
     checker: str,
     message: str,
-    file: Optional[str] = None,
-    line: Optional[int] = None,
-    col: Optional[int] = None,
+    file: str | None = None,
+    line: int | None = None,
+    col: int | None = None,
     error_type: str = "error",
 ) -> None:
     """
@@ -114,7 +120,7 @@ def print_versions(config: c2cciutils.configuration.PrintVersions) -> bool:
         try:
             sys.stdout.flush()
             sys.stderr.flush()
-            current_version = subprocess.check_output(version.get("cmd", [])).decode()
+            current_version = subprocess.check_output(version.get("cmd", [])).decode()  # noqa: S603
             print(f"{version.get('prefix', '')}{current_version}")
         except PermissionError as exception:
             error(
@@ -138,7 +144,7 @@ def print_versions(config: c2cciutils.configuration.PrintVersions) -> bool:
     return True
 
 
-def gopass(key: str, default: Optional[str] = None) -> Optional[str]:
+def gopass(key: str, default: str | None = None) -> str | None:
     """
     Get a value from gopass.
 
@@ -150,7 +156,7 @@ def gopass(key: str, default: Optional[str] = None) -> Optional[str]:
 
     """
     try:
-        return subprocess.check_output(["gopass", "show", key]).strip().decode()
+        return subprocess.check_output(["gopass", "show", key]).strip().decode()  # noqa: S603,S607
     except FileNotFoundError:
         if default is not None:
             return default
@@ -174,9 +180,10 @@ def add_authorization_header(headers: dict[str, str]) -> dict[str, str]:
             else gopass("gs/ci/github/token/gopass")
         )
         headers["Authorization"] = f"Bearer {token}"
-        return headers
     except FileNotFoundError:
         return headers
+    else:
+        return headers
 
 
 def check_response(response: requests.Response, raise_for_status: bool = True) -> Any:
@@ -205,7 +212,7 @@ def graphql(query_file: str, variables: dict[str, Any], default: Any = None) ->
     In case of error it throw an exception
 
     """
-    with open(os.path.join(os.path.dirname(__file__), query_file), encoding="utf-8") as query_open:
+    with (Path(__file__).parent / query_file).open(encoding="utf-8") as query_open:
         query = query_open.read()
 
     http_response = requests.post(
@@ -214,24 +221,26 @@ def graphql(query_file: str, variables: dict[str, Any], default: Any = None) ->
             {
                 "query": query,
                 "variables": variables,
-            }
+            },
         ),
         headers=add_authorization_header(
             {
                 "Content-Type": "application/json",
-            }
+            },
         ),
         timeout=int(os.environ.get("C2CCIUTILS_TIMEOUT", "30")),
     )
     if http_response.status_code in (401, 403) and default is not None:
         print(f"::warning::GraphQL error: {http_response.status_code}, use default value")
-        check_response(http_response, False)
+        check_response(http_response, raise_for_status=False)
         return default
     check_response(http_response)
     json_response = http_response.json()
 
     if "errors" in json_response:
-        raise RuntimeError(f"GraphQL error: {json.dumps(json_response['errors'], indent=2)}")
+        message = f"GraphQL error: {json.dumps(json_response['errors'], indent=2)}"
+        raise RuntimeError(message)
     if "data" not in json_response:
-        raise RuntimeError(f"GraphQL no data: {json.dumps(json_response, indent=2)}")
-    return cast(dict[str, Any], json_response["data"])
+        message = f"GraphQL no data: {json.dumps(json_response, indent=2)}"
+        raise RuntimeError(message)
+    return cast("dict[str, Any]", json_response["data"])

c2cciutils-1.9.0.dev29/c2cciutils/applications-versions.yaml

@@ -0,0 +1,2 @@
+# https://docs.renovatebot.com/modules/datasource/#github-releases-datasource
+postgresql: 18.12.1 # helm - https://charts.bitnami.com/bitnami

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/configuration.py

@@ -1,24 +1,28 @@
-"""Automatically generated file from a JSON schema."""
+# Copyright (c) 2020-2026, Camptocamp SA
+
+"""
+Automatically generated file from a JSON schema.
+"""
 
 from typing import Any, TypedDict
 
 
 class Configuration(TypedDict, total=False):
-    """
+    r"""
     configuration.
 
     C2C CI utils configuration file
     """
 
     print_versions: "PrintVersions"
-    """
+    r"""
     Print versions.
 
     The print versions configuration
     """
 
     k8s: "K8SConfiguration"
-    """
+    r"""
     K8s configuration.
 
     default:
@@ -27,7 +31,7 @@ class Configuration(TypedDict, total=False):
 
 
 DB_CONFIGURATION_DEFAULT: dict[str, Any] = {}
-""" Default value of the field path 'K8s configuration db' """
+r""" Default value of the field path 'K8s configuration db' """
 
 
 # | DB configuration.
@@ -76,15 +80,15 @@ K3DConfiguration = TypedDict(
 
 
 K3D_CONFIGURATION_DEFAULT: dict[str, Any] = {}
-""" Default value of the field path 'K8s configuration k3d' """
+r""" Default value of the field path 'K8s configuration k3d' """
 
 
 K3D_INSTALL_COMMANDS_DEFAULT = [["k3d", "cluster", "create", "test-cluster", "--no-lb", "--no-rollback"]]
-""" Default value of the field path 'K3d configuration install-commands' """
+r""" Default value of the field path 'K3d configuration install-commands' """
 
 
 class K8SConfiguration(TypedDict, total=False):
-    """
+    r"""
     K8s configuration.
 
     default:
@@ -92,7 +96,7 @@ class K8SConfiguration(TypedDict, total=False):
     """
 
     k3d: "K3DConfiguration"
-    """
+    r"""
     K3d configuration.
 
     default:
@@ -100,7 +104,7 @@ class K8SConfiguration(TypedDict, total=False):
     """
 
     db: "DbConfiguration"
-    """
+    r"""
     DB configuration.
 
     Database configuration
@@ -111,7 +115,7 @@ class K8SConfiguration(TypedDict, total=False):
 
 
 K8S_CONFIGURATION_DEFAULT: dict[str, Any] = {}
-""" Default value of the field path 'configuration k8s' """
+r""" Default value of the field path 'configuration k8s' """
 
 
 K8S_DB_CHART_OPTIONS_DEFAULT = {
@@ -121,7 +125,7 @@ K8S_DB_CHART_OPTIONS_DEFAULT = {
     "auth.postgresPassword": "mySuperTestingPassword",
     "volumePermissions.enabled": "true",
 }
-""" Default value of the field path 'DB configuration chart-options' """
+r""" Default value of the field path 'DB configuration chart-options' """
 
 
 PRINT_VERSIONS_VERSIONS_DEFAULT = [
@@ -135,18 +139,18 @@ PRINT_VERSIONS_VERSIONS_DEFAULT = [
     {"name": "java", "cmd": ["java", "-version"]},
     {"name": "helm", "cmd": ["helm", "version"], "prefix": "HELM: "},
 ]
-""" Default value of the field path 'Print versions versions' """
+r""" Default value of the field path 'Print versions versions' """
 
 
 class PrintVersions(TypedDict, total=False):
-    """
+    r"""
     Print versions.
 
     The print versions configuration
     """
 
     versions: list["_PrintVersionsVersionsItem"]
-    """
+    r"""
     Print versions versions.
 
     default:
@@ -197,10 +201,10 @@ class PrintVersions(TypedDict, total=False):
 
 class _PrintVersionsVersionsItem(TypedDict, total=False):
     cmd: list[str]
-    """ The command that should be used """
+    r""" The command that should be used """
 
     name: str
-    """ The name """
+    r""" The name """
 
     prefix: str
-    """ Prefix added when we print the version """
+    r""" Prefix added when we print the version """

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/env.py

@@ -1,7 +1,10 @@
+# Copyright (c) 2020-2026, Camptocamp SA
+
 import json
 import os
 import subprocess  # nosec
 import sys
+from pathlib import Path
 
 import ruamel.yaml
 import yaml
@@ -45,7 +48,7 @@ def print_environment_variables() -> None:
 def print_github_event_file() -> None:
     """Print the GitHub event file."""
     if "GITHUB_EVENT_PATH" in os.environ:
-        with open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8") as event:
+        with Path(os.environ["GITHUB_EVENT_PATH"]).open(encoding="utf-8") as event:
             print(event.read())
 
 
@@ -57,17 +60,17 @@ def print_github_event_object() -> None:
 
 def print_python_package_version() -> None:
     """Print the version of the Python packages."""
-    subprocess.run(["python3", "-m", "pip", "freeze", "--all"])  # pylint: disable=subprocess-run-check
+    subprocess.run(["python3", "-m", "pip", "freeze", "--all"], check=False)  # pylint: disable=subprocess-run-check # noqa: S607
 
 
 def print_node_package_version() -> None:
     """Print the version of the Python packages."""
-    subprocess.run(["npm", "list", "--global"])  # pylint: disable=subprocess-run-check
+    subprocess.run(["npm", "list", "--global"], check=False)  # pylint: disable=subprocess-run-check # noqa: S607
 
 
 def print_debian_package_version() -> None:
     """Print the version of the Python packages."""
-    subprocess.run(["dpkg", "--list"])  # pylint: disable=subprocess-run-check
+    subprocess.run(["dpkg", "--list"], check=False)  # pylint: disable=subprocess-run-check # noqa: S607
 
 
 def print_environment(config: c2cciutils.configuration.Configuration, prefix: str = "Print ") -> None:
@@ -90,7 +93,7 @@ def print_environment(config: c2cciutils.configuration.Configuration, prefix: st
             ("Python package versions", print_python_package_version),
             ("Node package versions", print_node_package_version),
             ("Debian package versions", print_debian_package_version),
-        ]
+        ],
     )
 
     for name, function in functions:
@@ -101,7 +104,7 @@ def print_environment(config: c2cciutils.configuration.Configuration, prefix: st
         try:
             sys.stdout.flush()
             sys.stderr.flush()
-            function()  # type: ignore
+            function()  # type: ignore[operator]
         except subprocess.CalledProcessError as error:
             print(f"::error::Error: {error}")
             print("::endgroup::")

c2cciutils-1.9.0.dev29/c2cciutils/scripts/__init__.py

@@ -0,0 +1,3 @@
+# Copyright (c) 2020-2026, Camptocamp SA
+
+"""The scripts main functions."""

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/docker_logs.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
+# Copyright (c) 2020-2026, Camptocamp SA
 
 import argparse
-import os
+import datetime
 import subprocess  # nosec
 import sys
-from datetime import datetime
+from pathlib import Path
 
 
 def _print(message: str) -> None:
@@ -15,38 +16,41 @@ def _print(message: str) -> None:
 def main() -> None:
     """Print the list of running docker containers and their logs formatted for GitHub CI."""
     parser = argparse.ArgumentParser(
-        description=("Print the list of running docker containers and their logs formatted for GitHub CI.")
+        description=("Print the list of running docker containers and their logs formatted for GitHub CI."),
     )
     parser.parse_args()
 
-    if os.path.exists("docker-compose.yaml"):
+    if Path("docker-compose.yaml").exists():
         _print("::group::Docker Compose ps")
-        subprocess.run(["docker", "compose", "ps", "--all"], check=False)
+        subprocess.run(["docker", "compose", "ps", "--all"], check=False)  # noqa: S607
         _print("::endgroup::")
 
     _print("::group::Docker ps")
-    subprocess.run(["docker", "ps"], check=False)
+    subprocess.run(["docker", "ps", "--all"], check=False)  # noqa: S607
     _print("::endgroup::")
 
     # Store in /tmp/docker-logs-timestamp the current timestamp to avoid printing same logs multiple times.
     timestamp_args = []
-    if os.path.exists("/tmp/docker-logs-timestamp"):  # noqa: S108 # nosec
-        with open("/tmp/docker-logs-timestamp", encoding="utf-8") as timestamp_file:  # noqa: S108 # nosec
+    timestamp_file_path = Path("/tmp/docker-logs-timestamp")  # noqa: S108 # nosec
+    if timestamp_file_path.exists():  # nosec
+        with timestamp_file_path.open(encoding="utf-8") as timestamp_file:  # nosec
             timestamp_args = [f"--since={timestamp_file.read().strip()}Z"]
 
-    with open("/tmp/docker-logs-timestamp", "w", encoding="utf-8") as timestamp_file:  # noqa: S108 # nosec
-        timestamp_file.write(datetime.utcnow().isoformat())
+    with timestamp_file_path.open("w", encoding="utf-8") as timestamp_file:  # nosec
+        timestamp_file.write(datetime.datetime.now(tz=datetime.UTC).isoformat())
 
     for name in (
-        subprocess.run(
-            ["docker", "ps", "--all", "--format", "{{ .Names }}"], check=True, stdout=subprocess.PIPE
+        subprocess.run(  # noqa: S603,S607,RUF100
+            ["docker", "ps", "--all", "--format", "{{ .Names }}"],  # noqa: S607
+            check=True,
+            stdout=subprocess.PIPE,
         )
         .stdout.decode()
         .split("\n")
     ):
         if name:
             _print(f"::group::{name}: New logs")
-            subprocess.run(["docker", "logs"] + timestamp_args + [name], check=False)
+            subprocess.run(["docker", "logs", *timestamp_args, name], check=False)  # noqa: S603,S607
             _print("::endgroup::")
 
 

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/env.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# Copyright (c) 2020-2026, Camptocamp SA
 
 """The checker main function."""
 

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/k8s/__init__.py

@@ -1 +1,3 @@
+# Copyright (c) 2020-2026, Camptocamp SA
+
 """The commands that can be used to test a chart on Kubernetes."""

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/k8s/db.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python3
+# Copyright (c) 2020-2026, Camptocamp SA
 
 import argparse
 import os
 import subprocess  # nosec
 import sys
+from pathlib import Path
 from typing import cast
 
 import yaml
@@ -33,36 +35,34 @@ def main() -> None:
     parser.add_argument("--cleanup", action="store_true", help="Drop the database")
 
     config = c2cciutils.get_config()
-    with open(
-        os.path.join(
-            os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "applications-versions.yaml"
-        ),
-        encoding="utf-8",
-    ) as config_file:
-        versions = cast(dict[str, str], yaml.load(config_file, Loader=yaml.SafeLoader))
+    config_path = Path(__file__).resolve().parents[2] / "applications-versions.yaml"
+    with config_path.open(encoding="utf-8") as config_file:
+        versions = cast("dict[str, str]", yaml.load(config_file, Loader=yaml.SafeLoader))
 
     args = parser.parse_args()
 
     if args.cleanup:
         _print("::group::Cleanup the database")
-        subprocess.run([os.environ.get("HELM", "helm"), "uninstall", "test-pg"], check=False)
+        subprocess.run([os.environ.get("HELM", "helm"), "uninstall", "test-pg"], check=False)  # noqa: S603
         _print("::endgroup::")
         sys.exit(0)
 
     _print("::group::Add repo")
-    subprocess.run(
+    subprocess.run(  # noqa: S603
         [os.environ.get("HELM", "helm"), "repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"],
         check=True,
     )
     _print("::endgroup::")
 
     _print("::group::Install chart")
-    subprocess.run(
+    subprocess.run(  # noqa: S603
         [
             os.environ.get("HELM", "helm"),
             "install",
             "test-pg",
             f"--version={versions['postgresql']}",
+            "--set=image.repository=bitnamilegacy/postgresql",
+            "--set=volumePermissions.image.repository=bitnamilegacy/os-shell",
         ]
         + [
             f"--set={k}={v}"
@@ -77,21 +77,22 @@ def main() -> None:
     _print("::endgroup::")
 
     _print("::group::Wait ready")
-    subprocess.run(["c2cciutils-k8s-wait", "--selector=app.kubernetes.io/name=postgresql"], check=True)
+    subprocess.run(["c2cciutils-k8s-wait", "--selector=app.kubernetes.io/name=postgresql"], check=True)  # noqa: S607
     _print("::endgroup::")
 
     if args.script:
         _print("::group::Add data")
-        with open(args.script, encoding="utf-8") as script:
-            subprocess.run(
-                [
+        script_path = Path(args.script)
+        with script_path.open(encoding="utf-8") as script:
+            subprocess.run(  # noqa: S603,S607,RUF100
+                [  # noqa: S607
                     "kubectl",
                     "run",
                     "test-pg-postgresql-client",
                     "--rm",
                     "--restart=Never",
                     "--namespace=default",
-                    "--image=docker.io/bitnami/postgresql",
+                    "--image=docker.io/bitnamilegacy/postgresql",
                     "--env=PGPASSWORD=mySuperTestingPassword",
                     "--stdin=true",
                     "--command",

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/k8s/install.py

@@ -1,12 +1,14 @@
 #!/usr/bin/env python3
+# Copyright (c) 2020-2026, Camptocamp SA
 
 import argparse
 import subprocess  # nosec
 import sys
 
+import applications_download
+
 import c2cciutils
 import c2cciutils.configuration
-import c2cciutils.scripts.download_applications
 
 
 def _print(message: str) -> None:
@@ -22,7 +24,8 @@ def main() -> None:
     config = c2cciutils.get_config()
 
     _print("::group::Install")
-    c2cciutils.scripts.download_applications.download_c2cciutils_applications("k3d-io/k3d")
+    apps = applications_download.Applications()
+    apps.install("k3d-io/k3d")
     _print("::endgroup::")
 
     _print("::group::Create cluster")
@@ -31,7 +34,7 @@ def main() -> None:
         .get("k3d", {})
         .get("install-commands", c2cciutils.configuration.K3D_INSTALL_COMMANDS_DEFAULT)
     ):
-        subprocess.run(cmd, check=True)
+        subprocess.run(cmd, check=True)  # noqa: S603
     _print("::endgroup::")
 
 

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/k8s/logs.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# Copyright (c) 2020-2026, Camptocamp SA
 
 import argparse
 import subprocess  # nosec
@@ -18,34 +19,34 @@ def main() -> None:
     args = parser.parse_args()
 
     if args.namespace:
-        subprocess.run(["kubectl", "config", "set-context", "--current", "--namespace=default"], check=True)
+        subprocess.run(["kubectl", "config", "set-context", "--current", "--namespace=default"], check=True)  # noqa: S607
 
     try:
         _print("::group::Events")
-        subprocess.run(["kubectl", "get", "events"], check=False)
+        subprocess.run(["kubectl", "get", "events"], check=False)  # noqa: S607
         _print("::endgroup::")
 
         _print("::group::Deployments")
-        subprocess.run(["kubectl", "get", "deployments", "--output=wide"], check=False)
+        subprocess.run(["kubectl", "get", "deployments", "--output=wide"], check=False)  # noqa: S607
         _print("::endgroup::")
 
         _print("::group::Pods")
-        subprocess.run(["kubectl", "get", "pods", "--output=wide"], check=False)
+        subprocess.run(["kubectl", "get", "pods", "--output=wide"], check=False)  # noqa: S607
         _print("::endgroup::")
 
         for name in (
-            subprocess.run(["kubectl", "get", "pods", "--output=name"], check=True, stdout=subprocess.PIPE)
+            subprocess.run(["kubectl", "get", "pods", "--output=name"], check=True, stdout=subprocess.PIPE)  # noqa: S607
             .stdout.decode()
             .split("\n")
         ):
             if name:
                 _print(f"::group::{name}: Describe")
-                subprocess.run(["kubectl", "describe", name], check=False)
+                subprocess.run(["kubectl", "describe", name], check=False)  # noqa: S603,S607
                 _print("::endgroup::")
 
                 for container in (
-                    subprocess.run(
-                        ["kubectl", "get", name, "--output=jsonpath={.spec.initContainers[*].name}"],
+                    subprocess.run(  # noqa: S603,S607,RUF100
+                        ["kubectl", "get", name, "--output=jsonpath={.spec.initContainers[*].name}"],  # noqa: S607
                         check=True,
                         stdout=subprocess.PIPE,
                     )
@@ -54,12 +55,12 @@ def main() -> None:
                 ):
                     if name:
                         _print(f"::group::{name} {container}: Logs")
-                        subprocess.run(["kubectl", "logs", name, container], check=False)
+                        subprocess.run(["kubectl", "logs", name, container], check=False)  # noqa: S603,S607
                         _print("::endgroup::")
 
                 for container in (
-                    subprocess.run(
-                        ["kubectl", "get", name, "--output=jsonpath={.spec.containers[*].name}"],
+                    subprocess.run(  # noqa: S603,S607,RUF100
+                        ["kubectl", "get", name, "--output=jsonpath={.spec.containers[*].name}"],  # noqa: S607
                         check=True,
                         stdout=subprocess.PIPE,
                     )
@@ -67,7 +68,7 @@ def main() -> None:
                     .split()
                 ):
                     _print(f"::group::{name} {container}: Logs")
-                    subprocess.run(["kubectl", "logs", name, container], check=False)
+                    subprocess.run(["kubectl", "logs", name, container], check=False)  # noqa: S603,S607
                     _print("::endgroup::")
     except subprocess.CalledProcessError as exception:
         # No exit error

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/k8s/wait.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# Copyright (c) 2020-2026, Camptocamp SA
 
 import argparse
 import json
@@ -17,7 +18,7 @@ def _check_deployment_status(deployments: Any) -> bool:
         for condition in deployment["status"].get("conditions", []):
             if not condition["status"]:
                 print(
-                    f"::group::Deployment {deployment['metadata']['name']} not ready: {condition['message']}"
+                    f"::group::Deployment {deployment['metadata']['name']} not ready: {condition['message']}",
                 )
                 print(json.dumps(condition, indent=4))
                 print("::endgroup::")
@@ -26,7 +27,7 @@ def _check_deployment_status(deployments: Any) -> bool:
         if deployment["status"].get("unavailableReplicas", 0) != 0:
             print(
                 f"::group::Deployment {deployment['metadata']['name']} not ready there is {deployment['status'].get('unavailableReplicas', 0)} "
-                "unavailable replicas"
+                "unavailable replicas",
             )
             print(json.dumps(deployment["status"], indent=4))
             print("::endgroup::")
@@ -42,7 +43,7 @@ def _check_container_status(pod: Any, status: Any, is_init: bool = False) -> boo
     if not good:
         waiting = status["state"].get("waiting")
         terminated = status["state"].get("terminated")
-        state = waiting if waiting else terminated
+        state = waiting or terminated
         status_message = state.get("message", state.get("reason", "")) if state else ""
         if not status_message:
             state = status.get("lastState", {}).get("terminated", {})
@@ -54,7 +55,7 @@ def _check_container_status(pod: Any, status: Any, is_init: bool = False) -> boo
         status_message = status_message.strip()
         if status_message == "Completed":
             return True
-        print(f"::group::Container not ready in {pod['metadata']['name']}: {status_message}")  # noqa: E713
+        print(f"::group::Container not ready in {pod['metadata']['name']}: {status_message}")
         if status_message_long != status_message:
             print(status_message_long)
         print(json.dumps(status, indent=4))
@@ -68,14 +69,14 @@ def _check_pod_status(pods: Any) -> bool:
         for condition in pod["status"].get("conditions", []):
             if not condition["status"]:
                 print(
-                    f"::group::Pod not ready in {pod['metadata']['name']}: {condition.get('message', condition['type'])}"  # noqa: E713
+                    f"::group::Pod not ready in {pod['metadata']['name']}: {condition.get('message', condition['type'])}",
                 )
                 print(json.dumps(condition, indent=4))
                 print("::endgroup::")
                 return False
 
         for status in pod["status"].get("initContainerStatuses", []):
-            if not _check_container_status(pod, status, True):
+            if not _check_container_status(pod, status, is_init=True):
                 return False
         for status in pod["status"].get("containerStatuses", []):
             if not _check_container_status(pod, status):
@@ -100,22 +101,25 @@ def main() -> None:
     )
     parser.add_argument("--no-deployments", dest="deployments", action="store_false")
     parser.add_argument(
-        "--nb-try", default=20, type=int, help="Number of try to wait for the application to be ready"
+        "--nb-try",
+        default=20,
+        type=int,
+        help="Number of try to wait for the application to be ready",
     )
     parser.add_argument("--sleep", default=10, type=int, help="Sleep time before each try")
 
     args = parser.parse_args()
 
     if args.namespace:
-        subprocess.run(["kubectl", "config", "set-context", "--current", "--namespace=default"], check=True)
+        subprocess.run(["kubectl", "config", "set-context", "--current", "--namespace=default"], check=True)  # noqa: S607
 
     for _ in range(args.nb_try):
         time.sleep(args.sleep)
         success = True
         deployements_names = []
         if args.deployments:
-            deployments = subprocess.run(
-                ["kubectl", "get", "deployments", "--output=json"],
+            deployments = subprocess.run(  # noqa: S603,S607,RUF100
+                ["kubectl", "get", "deployments", "--output=json"],  # noqa: S607
                 stdout=subprocess.PIPE,
                 check=True,
             )
@@ -125,8 +129,8 @@ def main() -> None:
                 deployment["metadata"]["name"] for deployment in json.loads(deployments.stdout)["items"]
             ]
 
-        pods = subprocess.run(
-            ["kubectl", "get", "pods", "--output=json", f"--selector={args.selector}"],
+        pods = subprocess.run(  # noqa: S603,S607,RUF100
+            ["kubectl", "get", "pods", "--output=json", f"--selector={args.selector}"],  # noqa: S607
             stdout=subprocess.PIPE,
             check=True,
         )

{c2cciutils-1.8.0.dev68 → c2cciutils-1.9.0.dev29}/c2cciutils/scripts/main.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
+# Copyright (c) 2020-2026, Camptocamp SA
 
 """The main function of some utilities."""
 
 import argparse
+from importlib.metadata import version
 
-import pkg_resources
 import yaml
 
 import c2cciutils
@@ -22,8 +23,7 @@ def main() -> None:
         print(yaml.dump(c2cciutils.get_config(), default_flow_style=False, Dumper=yaml.SafeDumper))
 
     if args.version:
-        version = pkg_resources.get_distribution("c2cciutils").version
-        print(f"c2cciutils {version}")
+        print(f"c2cciutils {version('c2cciutils')}")
 
 
 if __name__ == "__main__":

c2cciutils-1.9.0.dev29/pyproject.toml

@@ -0,0 +1,111 @@
+[tool.ruff]
+target-version = "py311"
+line-length = 110
+
+[tool.ruff.lint]
+select = []
+ignore = ["ANN401", "C90", "COM812", "D100", "D104", "D105", "D107", "D200", "D202", "D207", "D208", "D212", "E501", "EM101", "EM102", "ERA001", "FA", "FBT001", "FBT002", "FIX002", "I001", "PERF203", "PLR09", "PLR2004", "Q000", "S101", "SIM105", "T201", "TD002", "W293"]
+extend-select = ["UP", "I", "S", "B", "ALL"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "numpy"
+
+[tool.ruff.lint.extend-per-file-ignores]
+"tests/**" = ["ANN", "ARG", "ASYNC", "BLE001", "D", "DTZ", "E722", "FBT003", "INP001", "N", "PGH003", "PLC", "PLR2004", "PLW0603", "PLW1641", "RET", "RUF012", "RUF100", "S104", "S105", "S106", "S108", "S113", "S324", "S603", "S607", "S608", "SLF", "TRY003", "TRY301"]
+"**/tests/**" = ["ANN", "ARG", "ASYNC", "BLE001", "D", "DTZ", "E722", "FBT003", "INP001", "N", "PGH003", "PLC", "PLR2004", "PLW0603", "PLW1641", "RET", "RUF012", "RUF100", "S104", "S105", "S106", "S108", "S113", "S324", "S603", "S607", "S608", "SLF", "TRY003", "TRY301"]
+"**/test_*.py" = ["ANN", "ARG", "ASYNC", "BLE001", "D", "DTZ", "E722", "FBT003", "INP001", "N", "PGH003", "PLC", "PLR2004", "PLW0603", "PLW1641", "RET", "RUF012", "RUF100", "S104", "S105", "S106", "S108", "S113", "S324", "S603", "S607", "S608", "SLF", "TRY003", "TRY301"]
+"**/*_test.py" = ["ANN", "ARG", "ASYNC", "BLE001", "D", "DTZ", "E722", "FBT003", "INP001", "N", "PGH003", "PLC", "PLR2004", "PLW0603", "PLW1641", "RET", "RUF012", "RUF100", "S104", "S105", "S106", "S108", "S113", "S324", "S603", "S607", "S608", "SLF", "TRY003", "TRY301"]
+
+[tool.poetry]
+exclude = ["c2cciutils/node_modules/**/test"]
+
+[tool.poetry.dependencies]
+python = ">=3.11,<4.0"
+requests = "2.33.0"
+"ruamel.yaml" = "0.19.1"
+PyYAML = "6.0.3"
+applications-download = "1.5.0"
+
+[tool.poetry.group.dev.dependencies]
+prospector = { version = "1.19.1", extras = ["with-bandit", "with-mypy", "with-pyroma", "with-ruff", "with_ruff", "with_pyroma"] }
+prospector-profile-duplicated = "1.12.0"
+prospector-profile-utils = "1.27.0"
+ruff = "0.16.9"
+types-requests = "2.33.0.20260906"
+types-pyyaml = "6.0.12.20260906"
+pylint = "4.0.9"
+
+[tool.poetry-dynamic-versioning]
+enable = false
+vcs = "git"
+pattern = "^(?P<base>\\d+(\\.\\d+)*)"
+format-jinja = """
+{%- if env.get("VERSION_TYPE") == "default_branch" -%}
+{{serialize_pep440(bump_version(base, 1), dev=distance)}}
+{%- elif env.get("VERSION_TYPE") == "stabilization_branch" -%}
+{{serialize_pep440(bump_version(base, 2), dev=distance)}}
+{%- elif distance == 0 -%}
+{{serialize_pep440(base)}}
+{%- else -%}
+{{serialize_pep440(bump_version(base), dev=distance)}}
+{%- endif -%}
+"""
+
+[tool.poetry-plugin-tweak-dependencies-version]
+default = "major"
+codespell = "full"
+cryptography = "present"
+certifi = "present"
+
+[project]
+classifiers = [
+    'Development Status :: 5 - Production/Stable',
+    'Environment :: Console',
+    'Intended Audience :: Developers',
+    'Operating System :: OS Independent',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
+    'Typing :: Typed',
+]
+dynamic = ["dependencies"]
+name = "c2cciutils"
+description = "Common utilities for Camptocamp CI"
+readme = "README.md"
+keywords = ["ci"]
+license = "FreeBSD"
+authors = [{name = "Camptocamp",email = "info@camptocamp.com"}]
+packages = [{ include = "c2cciutils" }]
+include = [
+    "c2cciutils/py.typed",
+    "c2cciutils/*.graphql",
+    "c2cciutils/*.yaml",
+    "c2cciutils/*.json",
+]
+requires-python = ">=3.11"
+dependencies = ["requests<3,>=2", "ruamel.yaml<1,>=0", "PyYAML<7,>=6", "applications-download<2,>=1"]
+version = "1.9.0.dev29"
+
+[project.urls]
+repository = "https://github.com/camptocamp/c2cciutils"
+"Bug Tracker" = "https://github.com/camptocamp/c2cciutils/issues"
+
+[project.scripts]
+c2cciutils = "c2cciutils.scripts.main:main"
+c2cciutils-env = "c2cciutils.scripts.env:main"
+c2cciutils-k8s-install = "c2cciutils.scripts.k8s.install:main"
+c2cciutils-k8s-db = "c2cciutils.scripts.k8s.db:main"
+c2cciutils-k8s-wait = "c2cciutils.scripts.k8s.wait:main"
+c2cciutils-k8s-logs = "c2cciutils.scripts.k8s.logs:main"
+c2cciutils-docker-logs = "c2cciutils.scripts.docker_logs:main"
+
+[build-system]
+requires = [
+    "poetry-core>=1.0.0",
+    "poetry-dynamic-versioning[plugin]>=0.19.0",
+    "poetry-dynamic-versioning",
+    # "poetry-plugin-drop-python-upper-constraint",
+]
+build-backend = "poetry.core.masonry.api"

c2cciutils-1.8.0.dev68/c2cciutils/applications-versions.yaml

@@ -1,3 +0,0 @@
-# https://docs.renovatebot.com/modules/datasource/#github-releases-datasource
-k3d-io/k3d: v5.8.3 # github-releases
-postgresql: 16.4.14 # helm - https://charts.bitnami.com/bitnami

c2cciutils-1.8.0.dev68/c2cciutils/applications.yaml

@@ -1,22 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema-applications.json
-
-k3d-io/k3d:
-  get-file-name: k3d-linux-amd64
-  to-file-name: k3d
-  finish-commands:
-    - - chmod
-      - +x
-      - k3d
-    - - k3d
-      - --version
-helm/chart-releaser:
-  get-file-name: chart-releaser_{short_version}_linux_amd64.tar.gz
-  type: tar
-  tar-file-name: cr
-  to-file-name: cr
-  finish-commands:
-    - - chmod
-      - +x
-      - cr
-    - - cr
-      - version

c2cciutils-1.8.0.dev68/c2cciutils/applications_definition.py

@@ -1,51 +0,0 @@
-"""Automatically generated file from a JSON schema."""
-
-from typing import Literal, TypedDict
-
-# | Application configuration.
-# |
-# | An application configuration
-ApplicationConfiguration = TypedDict(
-    "ApplicationConfiguration",
-    {
-        # | URL pattern.
-        # |
-        # | URL pattern, to be used for files that didn't come from GitHub release, available arguments: {version}
-        "url-pattern": str,
-        # | The type of file.
-        # |
-        # | The type of file
-        "type": "TheTypeOfFile",
-        # | The filename to get.
-        # |
-        # | The name of the file to get in the GitHub release
-        "get-file-name": str,
-        # | The created tile name.
-        # |
-        # | The name of the final tile we will create
-        "to-file-name": str,
-        # | The tile name to get in the tar file.
-        "tar-file-name": str,
-        # | The commands to run after the tile creation.
-        "finish-commands": list[list[str]],
-    },
-    total=False,
-)
-
-
-ApplicationsConfiguration = dict[str, "ApplicationConfiguration"]
-"""
-Applications configuration.
-
-All the applications configuration
-"""
-
-
-TheTypeOfFile = Literal["tar"]
-"""
-The type of file.
-
-The type of file
-"""
-THETYPEOFFILE_TAR: Literal["tar"] = "tar"
-"""The values for the 'The type of file' enum"""

c2cciutils-1.8.0.dev68/c2cciutils/scripts/__init__.py

@@ -1 +0,0 @@
-"""The scripts main functions."""

c2cciutils-1.8.0.dev68/c2cciutils/scripts/download_applications.py

@@ -1,108 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import subprocess  # nosec
-import tarfile
-import urllib
-from glob import glob
-from io import BytesIO
-from typing import Optional, cast
-
-import requests
-import yaml
-
-from c2cciutils import applications_definition
-
-
-def main() -> None:
-    """Download applications from GitHub releases or any other URLs to the ~/.local/bin folder."""
-    argparser = argparse.ArgumentParser(
-        description="""Download applications from GitHub releases or any other URLs to the ~/.local/bin folder.
-            Based on tow files, the first contains the information about from where to download the applications,
-            how to extract the application from the archive, and the executable name.
-            The second file contains the versions of the applications to download,
-            this file is usually updated by Renovate."""
-    )
-    argparser.add_argument("--applications-file", required=True)
-    argparser.add_argument("--versions-file", required=True)
-    args = argparser.parse_args()
-
-    with open(args.versions_file, encoding="utf-8") as config_file:
-        versions = cast(dict[str, str], yaml.load(config_file, Loader=yaml.SafeLoader))
-    with open(args.applications_file, encoding="utf-8") as config_file:
-        applications = cast(
-            applications_definition.ApplicationsConfiguration, yaml.load(config_file, Loader=yaml.SafeLoader)
-        )
-    download_applications(applications, versions)
-
-
-def download_c2cciutils_applications(name: Optional[str] = None) -> None:
-    """Download the applications defined in the c2cciutils package."""
-    with open(
-        os.path.join(os.path.dirname(os.path.dirname(__file__)), "applications-versions.yaml"),
-        encoding="utf-8",
-    ) as config_file:
-        versions = cast(dict[str, str], yaml.load(config_file, Loader=yaml.SafeLoader))
-    with open(
-        os.path.join(os.path.dirname(os.path.dirname(__file__)), "applications.yaml"), encoding="utf-8"
-    ) as config_file:
-        applications = cast(
-            applications_definition.ApplicationsConfiguration, yaml.load(config_file, Loader=yaml.SafeLoader)
-        )
-    if name is not None:
-        applications = {name: applications[name]}
-    download_applications(applications, versions)
-
-
-def download_applications(
-    applications: applications_definition.ApplicationsConfiguration, versions: dict[str, str]
-) -> None:
-    """Download the versions of applications specified in the configuration."""
-    bin_path = os.path.join(os.environ["HOME"], ".local", "bin")
-    if not os.path.exists(bin_path):
-        os.makedirs(bin_path)
-
-    for key, app in applications.items():
-        # The versions file is used to don't re-download an already downloaded application
-        version_file = os.path.join(bin_path, f"{app['to-file-name']}-version-{versions[key]}")
-        if not os.path.exists(version_file):
-            print(f"Download {app['to-file-name']} version {versions[key]}")
-            version = versions[key]
-            version_quote = urllib.parse.quote_plus(version)
-            params = {
-                "version": version,
-                "version_quote": version_quote,
-                "short_version": version.lstrip("v"),
-            }
-            response = requests.get(
-                app.get(
-                    "url-pattern",
-                    f"https://github.com/{key}/releases/download/{version_quote}/{app.get('get-file-name', '')}",
-                ).format(**params),
-                timeout=int(os.environ.get("C2CCIUTILS_TIMEOUT", "30")),
-            )
-            response.raise_for_status()
-
-            if app.get("type") == "tar":
-                with tarfile.open(fileobj=BytesIO(response.content)) as tar:
-                    extracted_file = tar.extractfile(app["tar-file-name"])
-                    assert extracted_file is not None
-                    content = extracted_file.read()
-            else:
-                content = response.content
-
-            with open(os.path.join(bin_path, app["to-file-name"]), "wb") as destination_file:
-                destination_file.write(content)
-
-            for command in app.get("finish-commands", []):
-                subprocess.run(command, check=True, cwd=bin_path)
-
-            for file_name in glob(f"{app['to-file-name']}-version-*"):
-                os.remove(file_name)
-            with open(version_file, "w", encoding="utf-8") as _:
-                pass
-
-
-if __name__ == "__main__":
-    main()

c2cciutils-1.8.0.dev68/pyproject.toml

@@ -1,97 +0,0 @@
-[tool.black]
-line-length = 110
-target-version = ["py39"]
-
-[tool.isort]
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = false
-use_parentheses = true
-line_length = 110
-
-[tool.mypy]
-python_version = "3.11"
-ignore_missing_imports = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_return_any = true
-strict = true
-
-[tool.poetry]
-name = "c2cciutils"
-version = "1.8.0.dev68"
-description = "Common utilities for Camptocamp CI"
-readme = "README.md"
-authors = ["Camptocamp <info@camptocamp.com>"]
-keywords = ["ci"]
-repository = "https://github.com/camptocamp/c2cciutils"
-license = "FreeBSD"
-packages = [{ include = "c2cciutils" }]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Environment :: Console",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Typing :: Typed",
-]
-include = [
-    "c2cciutils/py.typed",
-    "c2cciutils/*.graphql",
-    "c2cciutils/*.yaml",
-    "c2cciutils/*.json",
-]
-exclude = ["c2cciutils/node_modules/**/test"]
-
-[tool.poetry.scripts]
-c2cciutils = "c2cciutils.scripts.main:main"
-c2cciutils-env = "c2cciutils.scripts.env:main"
-c2cciutils-k8s-install = "c2cciutils.scripts.k8s.install:main"
-c2cciutils-k8s-db = "c2cciutils.scripts.k8s.db:main"
-c2cciutils-k8s-wait = "c2cciutils.scripts.k8s.wait:main"
-c2cciutils-k8s-logs = "c2cciutils.scripts.k8s.logs:main"
-c2cciutils-docker-logs = "c2cciutils.scripts.docker_logs:main"
-
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0"
-requests = "2.32.3"
-"ruamel.yaml" = "0.18.10"
-PyYAML = "6.0.2"
-
-[tool.poetry.group.dev.dependencies]
-prospector = { version = "1.14.1", extras = ["with-bandit", "with-mypy", "with-pyroma", "with-ruff"] }
-prospector-profile-duplicated = "1.10.4"
-prospector-profile-utils = "1.17.0"
-types-requests = "2.32.0.20250301"
-types-pyyaml = "6.0.12.20241230"
-
-[build-system]
-requires = [
-    "poetry-core>=1.0.0",
-    "poetry-dynamic-versioning[plugin]>=0.19.0",
-    "poetry-plugin-tweak-dependencies-version",
-    "poetry-dynamic-versioning",
-    # "poetry-plugin-drop-python-upper-constraint",
-]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry-dynamic-versioning]
-enable = false
-vcs = "git"
-pattern = "^(?P<base>\\d+(\\.\\d+)*)"
-format-jinja = """
-{%- if env.get("VERSION_TYPE") == "version_branch" -%}
-{{serialize_pep440(bump_version(base, 1 if env.get("IS_MASTER") == "TRUE" else 2), dev=distance)}}
-{%- elif distance == 0 -%}
-{{serialize_pep440(base)}}
-{%- else -%}
-{{serialize_pep440(bump_version(base), dev=distance)}}
-{%- endif -%}
-"""
-
-[tool.poetry-plugin-tweak-dependencies-version]
-default = "major"
-codespell = "full"
-cryptography = "present"
-certifi = "present"