c2cciutils 1.7.3.dev2__tar.gz → 1.8.0.dev45__tar.gz

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cciutils
-Version: 1.7.3.dev2
+Version: 1.8.0.dev45
 Summary: Common utilities for Camptocamp CI
 Home-page: https://github.com/camptocamp/c2cciutils
 License: FreeBSD
@@ -38,8 +38,8 @@ Requires-Dist: id (>=1.0.0,<2.0.0) ; extra == "publish"
 Requires-Dist: multi-repo-automation (>=1.0.0,<2.0.0) ; extra == "version"
 Requires-Dist: requests (>=2.0.0,<3.0.0)
 Requires-Dist: ruamel.yaml (>=0.0.0,<1.0.0)
-Requires-Dist: security-md (>=0.0.0,<1.0.0)
-Requires-Dist: twine (>=5.0.0,<6.0.0) ; extra == "publish"
+Requires-Dist: security-md (>=1.0.0,<2.0.0)
+Requires-Dist: twine (>=6.0.0,<7.0.0) ; extra == "publish"
 Project-URL: Repository, https://github.com/camptocamp/c2cciutils
 Description-Content-Type: text/markdown
 

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/__init__.py

@@ -1,6 +1,4 @@
-"""
-c2cciutils shared utils function.
-"""
+"""c2cciutils shared utils function."""
 
 import glob
 import json
@@ -18,9 +16,7 @@ import c2cciutils.configuration
 
 
 def get_repository() -> str:
-    """
-    Get the current GitHub repository like `organization/project`.
-    """
+    """Get the current GitHub repository like `organization/project`."""
     if "GITHUB_REPOSITORY" in os.environ:
         return os.environ["GITHUB_REPOSITORY"]
 
@@ -44,11 +40,12 @@ def merge(default_config: Any, config: Any) -> Any:
     Arguments:
         default_config: The default config that will be applied
         config: The base config, will be modified
+
     """
     if not isinstance(default_config, dict) or not isinstance(config, dict):
         return config
 
-    for key in default_config.keys():
+    for key in default_config:
         if key not in config:
             config[key] = default_config[key]
         else:
@@ -73,9 +70,7 @@ def get_master_branch(repo: list[str]) -> tuple[str, bool]:
 
 
 def get_config() -> c2cciutils.configuration.Configuration:
-    """
-    Get the configuration, with project and auto detections.
-    """
+    """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:
@@ -155,6 +150,7 @@ def error(
         line: The line number of the error
         col: The column number of the error
         error_type: The kind of error (error or warning)
+
     """
     result = ""
     on_ci = os.environ.get("CI", "false").lower() == "true"
@@ -197,6 +193,7 @@ def compile_re(config: c2cciutils.configuration.VersionTransform, prefix: str =
         prefix: The version prefix
 
     Return the compiled transform config.
+
     """
     result = []
     for conf in config:
@@ -226,6 +223,7 @@ def match(
 
     Returns the re match object, the matched config and the value as a tuple
     On no match it returns None, value
+
     """
     for conf in config:
         matched = conf["from"].match(value)
@@ -243,6 +241,7 @@ def does_match(value: str, config: list[VersionTransform]) -> bool:
         config: The result of `compile`
 
     Returns True it it does match else False
+
     """
     matched, _, _ = match(value, config)
     return matched is not None
@@ -262,6 +261,7 @@ def get_value(matched: Optional[Match[str]], config: Optional[VersionTransform],
         value: The default value on returned no match
 
     Return the value
+
     """
     return matched.expand(config.get("to", r"\1")) if matched is not None and config is not None else value
 
@@ -272,6 +272,7 @@ def print_versions(config: c2cciutils.configuration.PrintVersions) -> bool:
 
     Arguments:
         config: The print configuration
+
     """
     for version in config.get("versions", c2cciutils.configuration.PRINT_VERSIONS_VERSIONS_DEFAULT):
         try:
@@ -310,6 +311,7 @@ def gopass(key: str, default: Optional[str] = None) -> Optional[str]:
         default: the value to return if gopass is not found
 
     Return the value
+
     """
     try:
         return subprocess.check_output(["gopass", "show", key]).strip().decode()
@@ -326,6 +328,7 @@ def gopass_put(secret: str, key: str) -> None:
     Arguments:
         secret: The secret value
         key: The key
+
     """
     subprocess.check_output(["gopass", "insert", "--force", key], input=secret.encode())
 
@@ -338,6 +341,7 @@ def add_authorization_header(headers: dict[str, str]) -> dict[str, str]:
         headers: The headers
 
     Return the headers (to be chained)
+
     """
     try:
         token = (
@@ -375,6 +379,7 @@ def graphql(query_file: str, variables: dict[str, Any], default: Any = None) ->
 
     Return the data result
     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:
         query = query_open.read()

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/applications-versions.yaml

@@ -1,4 +1,4 @@
 # https://docs.renovatebot.com/modules/datasource/#github-releases-datasource
 k3d-io/k3d: v5.7.5 # github-releases
-postgresql: 16.0.6 # helm - https://charts.bitnami.com/bitnami
-helm/chart-releaser: v1.6.1 # github-releases
+postgresql: 16.3.5 # helm - https://charts.bitnami.com/bitnami
+helm/chart-releaser: v1.7.0 # github-releases

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/applications_definition.py

@@ -1,8 +1,6 @@
-"""
-Automatically generated file from a JSON schema.
-"""
+"""Automatically generated file from a JSON schema."""
 
-from typing import Literal, TypedDict, Union
+from typing import Literal, TypedDict
 
 # | Application configuration.
 # |
@@ -43,7 +41,7 @@ All the applications configuration
 """
 
 
-TheTypeOfFile = Union[Literal["tar"]]
+TheTypeOfFile = Literal["tar"]
 """
 The type of file.
 

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/configuration.py

@@ -1,6 +1,4 @@
-"""
-Automatically generated file from a JSON schema.
-"""
+"""Automatically generated file from a JSON schema."""
 
 from typing import Any, Literal, TypedDict, Union
 
@@ -721,7 +719,7 @@ default:
 
 
 class _PublishDockerConfigSnyk(TypedDict, total=False):
-    """Checks the published images with Snyk"""
+    """Checks the published images with Snyk."""
 
     monitor_args: Union["_PublishDockerSnykMonitorArgsOneof0", "_PublishDockerSnykMonitorArgsOneof1"]
     """

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/env.py

@@ -10,9 +10,7 @@ import c2cciutils.configuration
 
 
 class PrintVersions:
-    """
-    Print some tools versions.
-    """
+    """Print some tools versions."""
 
     def __init__(self, config: c2cciutils.configuration.PrintVersions) -> None:
         """Construct."""
@@ -24,9 +22,7 @@ class PrintVersions:
 
 
 class PrintConfig:
-    """
-    Print the configuration.
-    """
+    """Print the configuration."""
 
     def __init__(self, config: c2cciutils.configuration.Configuration) -> None:
         """Construct."""
@@ -40,49 +36,37 @@ class PrintConfig:
 
 
 def print_environment_variables() -> None:
-    """
-    Print the environment variables.
-    """
+    """Print the environment variables."""
     for name, value in sorted(os.environ.items()):
         if name != "GITHUB_EVENT":
             print(f"{name}: {value}")
 
 
 def print_github_event_file() -> None:
-    """
-    Print the GitHub event file.
-    """
+    """Print the GitHub event file."""
     if "GITHUB_EVENT_PATH" in os.environ:
         with open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8") as event:
             print(event.read())
 
 
 def print_github_event_object() -> None:
-    """
-    Print the GitHub event object.
-    """
+    """Print the GitHub event object."""
     github_event = json.loads(os.environ["GITHUB_EVENT"])
     print(yaml.dump(github_event, indent=2))
 
 
 def print_python_package_version() -> None:
-    """
-    Print the version of the Python packages.
-    """
+    """Print the version of the Python packages."""
     subprocess.run(["python3", "-m", "pip", "freeze", "--all"])  # pylint: disable=subprocess-run-check
 
 
 def print_node_package_version() -> None:
-    """
-    Print the version of the Python packages.
-    """
+    """Print the version of the Python packages."""
     subprocess.run(["npm", "list", "--global"])  # pylint: disable=subprocess-run-check
 
 
 def print_debian_package_version() -> None:
-    """
-    Print the version of the Python packages.
-    """
+    """Print the version of the Python packages."""
     subprocess.run(["dpkg", "--list"])  # pylint: disable=subprocess-run-check
 
 

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/lib/docker.py

@@ -1,6 +1,4 @@
-"""
-Some utility functions for Docker images.
-"""
+"""Some utility functions for Docker images."""
 
 import os
 import subprocess  # nosec: B404
@@ -102,9 +100,7 @@ def get_dpkg_packages_versions(
 
 
 def get_versions_config() -> tuple[dict[str, dict[str, str]], bool]:
-    """
-    Get the versions from the config file.
-    """
+    """Get the versions from the config file."""
     if os.path.exists("ci/dpkg-versions.yaml"):
         with open("ci/dpkg-versions.yaml", encoding="utf-8") as versions_file:
             return (

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/lib/oidc.py

@@ -154,8 +154,10 @@ def pypi_login() -> None:
     Connect to PyPI using OpenID Connect and mint a token for the user.
 
     See Also
+    --------
     - https://docs.github.com/en/actions/security-for-github-actions/security-hardening-your-deployments/about-security-hardening-with-openid-connect
     - https://docs.github.com/en/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-pypi
+
     """
     pypirc_filename = os.path.expanduser("~/.pypirc")
 

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/package-lock.json

@@ -8,45 +8,45 @@
       "name": "c2ccicheck",
       "version": "1.0.0",
       "dependencies": {
-        "snyk": "1.1293.1"
+        "snyk": "1.1294.3"
       }
     },
     "node_modules/@sentry-internal/tracing": {
-      "version": "7.119.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.119.0.tgz",
-      "integrity": "sha512-oKdFJnn+56f0DHUADlL8o9l8jTib3VDLbWQBVkjD9EprxfaCwt2m8L5ACRBdQ8hmpxCEo4I8/6traZ7qAdBUqA==",
+      "version": "7.120.2",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.120.2.tgz",
+      "integrity": "sha512-eo2F8cP6X+vr54Mp6vu+NoQEDz0M5O24Tz8jPY0T1CpiWdwCmHb7Sln+oLXeQ3/LlWdVQihBfKDBZfBdUfsBTg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "7.119.0",
-        "@sentry/types": "7.119.0",
-        "@sentry/utils": "7.119.0"
+        "@sentry/core": "7.120.2",
+        "@sentry/types": "7.120.2",
+        "@sentry/utils": "7.120.2"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/core": {
-      "version": "7.119.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.119.0.tgz",
-      "integrity": "sha512-CS2kUv9rAJJEjiRat6wle3JATHypB0SyD7pt4cpX5y0dN5dZ1JrF57oLHRMnga9fxRivydHz7tMTuBhSSwhzjw==",
+      "version": "7.120.2",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.120.2.tgz",
+      "integrity": "sha512-eurLBFQJC7WWWYoEna25Z9I/GJjqAmH339tv52XP8sqXV7B5hRcHDcfrsT/UGHpU316M24p3lWhj0eimtCZ0SQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/types": "7.119.0",
-        "@sentry/utils": "7.119.0"
+        "@sentry/types": "7.120.2",
+        "@sentry/utils": "7.120.2"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/integrations": {
-      "version": "7.119.0",
-      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.119.0.tgz",
-      "integrity": "sha512-OHShvtsRW0A+ZL/ZbMnMqDEtJddPasndjq+1aQXw40mN+zeP7At/V1yPZyFaURy86iX7Ucxw5BtmzuNy7hLyTA==",
+      "version": "7.120.2",
+      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.120.2.tgz",
+      "integrity": "sha512-bMvL2fD3TGLM5YAUoQ2Qz6bYeVU8f7YRFNSjKNxK4EbvFgAU9j1FD6EKg0V0RNOJYnJjGIZYMmcWTXBbVTJL6w==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "7.119.0",
-        "@sentry/types": "7.119.0",
-        "@sentry/utils": "7.119.0",
+        "@sentry/core": "7.120.2",
+        "@sentry/types": "7.120.2",
+        "@sentry/utils": "7.120.2",
         "localforage": "^1.8.1"
       },
       "engines": {
@@ -54,37 +54,37 @@
       }
     },
     "node_modules/@sentry/node": {
-      "version": "7.119.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.119.0.tgz",
-      "integrity": "sha512-9PFzN8xS6U0oZCflpVxS2SSIsHkCaj7qYBlsvHj4CTGWfao9ImwrU6+smy4qoG6oxwPfoVb5pOOMb4WpWOvXcQ==",
+      "version": "7.120.2",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.120.2.tgz",
+      "integrity": "sha512-ZnW9gpIGaoU+vYZyVZca9dObfmWYiXEWIMUM/JXaFb8AhP1OXvYweNiU0Pe/gNrz4oGAogU8scJc70ar7Vj0ww==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/tracing": "7.119.0",
-        "@sentry/core": "7.119.0",
-        "@sentry/integrations": "7.119.0",
-        "@sentry/types": "7.119.0",
-        "@sentry/utils": "7.119.0"
+        "@sentry-internal/tracing": "7.120.2",
+        "@sentry/core": "7.120.2",
+        "@sentry/integrations": "7.120.2",
+        "@sentry/types": "7.120.2",
+        "@sentry/utils": "7.120.2"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/types": {
-      "version": "7.119.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.119.0.tgz",
-      "integrity": "sha512-27qQbutDBPKGbuJHROxhIWc1i0HJaGLA90tjMu11wt0E4UNxXRX+UQl4Twu68v4EV3CPvQcEpQfgsViYcXmq+w==",
+      "version": "7.120.2",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.120.2.tgz",
+      "integrity": "sha512-FWVoiblHQJ892GaOqdXx/5/n5XDLF28z81vJ0lCY49PMh8waz8LJ0b9RSmt9tasSDl0OQ7eUlPl1xu1jTrv1NA==",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/utils": {
-      "version": "7.119.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.119.0.tgz",
-      "integrity": "sha512-ZwyXexWn2ZIe2bBoYnXJVPc2esCSbKpdc6+0WJa8eutXfHq3FRKg4ohkfCBpfxljQGEfP1+kfin945lA21Ka+A==",
+      "version": "7.120.2",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.120.2.tgz",
+      "integrity": "sha512-jgnQlw11mRfQrQRAXbq4zEd+tbYwHel5eqeS/oU6EImXRjmHNtS79nB8MHvJeQu1FMCpFs1Ymrrs5FICwS6VeQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/types": "7.119.0"
+        "@sentry/types": "7.120.2"
       },
       "engines": {
         "node": ">=8"
@@ -94,6 +94,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
       "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "license": "MIT"
     },
     "node_modules/define-data-property": {
@@ -137,13 +138,10 @@
       "license": "MIT"
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
       "engines": {
         "node": ">= 0.4"
       }
@@ -175,34 +173,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/global-agent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
@@ -237,12 +207,12 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -260,42 +230,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
@@ -398,9 +332,9 @@
       }
     },
     "node_modules/snyk": {
-      "version": "1.1293.1",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1293.1.tgz",
-      "integrity": "sha512-CnbNrsEUMGfajfJ5/03BIgx1ixWKr9Kk+9xDw6sZqKy4K5K01DkyUp/V+WjbCfjr0li9+aE7u70s276KEOuiNA==",
+      "version": "1.1294.3",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1294.3.tgz",
+      "integrity": "sha512-ZF+F2bv293HmpFxZCV0x8hT3rQGOl6rPDoJq/TqBT1i5/nZypfn8v4A1Q4m6zUSUs1g6WJsS8QR5wTlR/eSvMQ==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/package.json

@@ -4,6 +4,6 @@
   "description": "",
   "author": "",
   "dependencies": {
-    "snyk": "1.1293.1"
+    "snyk": "1.1294.3"
   }
 }

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/publish.py

@@ -1,6 +1,4 @@
-"""
-The publishing functions.
-"""
+"""The publishing functions."""
 
 import argparse
 import datetime
@@ -10,11 +8,11 @@ import pickle  # nosec
 import re
 import subprocess  # nosec
 import sys
-import tomllib
 import uuid
 from typing import Optional
 
 import ruamel.yaml
+import tomllib
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
 from google_auth_oauthlib.flow import InstalledAppFlow
@@ -24,17 +22,13 @@ import c2cciutils.configuration
 
 
 class GoogleCalendar:
-    """
-    Interact with the Google Calendar API.
-    """
+    """Interact with the Google Calendar API."""
 
     # pylint: disable=too-many-instance-attributes
     def __init__(self) -> None:
-        """
-        Initialize.
-        """
+        """Initialize."""
         self.scopes = ["https://www.googleapis.com/auth/calendar"]  # in fact it is better to hard-code this
-        self.credentials_pickle_file = os.environ.get("TMP_CREDS_FILE", f"/tmp/{uuid.uuid4()}.pickle")
+        self.credentials_pickle_file = os.environ.get("TMP_CREDS_FILE", f"/tmp/{uuid.uuid4()}.pickle")  # noqa: S108
         self.credentials_json_file = os.environ.get(
             "GOOGLE_CREDS_JSON_FILE", "~/google-credentials-c2cibot.json"
         )  # used to refresh the refresh_token or to initialize the credentials the first time
@@ -62,15 +56,13 @@ class GoogleCalendar:
         self.service = build("calendar", "v3", credentials=self.creds)
 
     def init_calendar_service(self) -> Credentials:  # type: ignore
-        """
-        Initialize the calendar service.
-        """
+        """Initialize the calendar service."""
         # The file token pickle stores the user's access and refresh tokens, and is
         # created automatically when the authorization flow completes for the first
         # time.
         if os.path.exists(self.credentials_pickle_file):
             with open(self.credentials_pickle_file, "rb") as token:
-                creds = pickle.load(token)  # nosec
+                creds = pickle.load(token)  # noqa: S301
         # If there are no (valid) credentials available, let the user log in.
         if not creds or not creds.valid:  # pylint: disable=possibly-used-before-assignment
             if creds and creds.expired and creds.refresh_token:
@@ -95,9 +87,7 @@ class GoogleCalendar:
                 pickle.dump(creds, token)
 
     def _update_creds(self) -> None:
-        """
-        Update the credentials.
-        """
+        """Update the credentials."""
         self.client_id = self.creds.client_id
         self.client_secret = self.creds.client_secret
         self.token = self.creds.token
@@ -105,9 +95,7 @@ class GoogleCalendar:
         self.refresh_token = self.creds.refresh_token
 
     def print_all_calendars(self) -> None:
-        """
-        Print all calendar events.
-        """
+        """Print all calendar events."""
         # list all the calendars that the user has access to.
         # used to debug credentials
         print("Getting list of calendars")
@@ -129,6 +117,7 @@ class GoogleCalendar:
 
         Arguments:
             time_min: The time to be considered.
+
         """
         now = datetime.datetime.utcnow()
         if not time_min:
@@ -163,6 +152,7 @@ class GoogleCalendar:
         Arguments:
             summary: The event summary
             description: The event description
+
         """
         now = datetime.datetime.now()
         start = now.isoformat()
@@ -178,9 +168,7 @@ class GoogleCalendar:
         print(f"Created event with id: {event_result['id']}")
 
     def save_credentials_to_gopass(self) -> None:
-        """
-        Save the calendar credentials to gopass.
-        """
+        """Save the calendar credentials to gopass."""
         objects_to_save = {
             "gs/ci/google_calendar/calendarId": self.calendar_id,
             "gs/ci/google_calendar/token": self.token,
@@ -194,17 +182,13 @@ class GoogleCalendar:
             c2cciutils.gopass_put(secret, key)
 
     def __del__(self) -> None:
-        """
-        Delete the credentials file.
-        """
+        """Delete the credentials file."""
         if os.path.exists(self.credentials_pickle_file):
             os.remove(self.credentials_pickle_file)
 
 
 def main_calendar() -> None:
-    """
-    Run the calendar main function.
-    """
+    """Run the calendar main function."""
     parser = argparse.ArgumentParser(
         description="Interact with google API for the Docker publishing calendar"
     )
@@ -254,6 +238,7 @@ def pip(
                     version_branch, feature_branch, feature_tag (for pull request)
         publish: If False only check the package
         package: The package configuration
+
     """
     print(f"::group::{'Publishing' if publish else 'Checking'} '{package.get('path')}' to pypi")
     sys.stdout.flush()
@@ -352,6 +337,7 @@ def docker(
         tag_src: The source tag (usually latest)
         dst_tags: Publish using the provided tags
         images_full: The list of published images (with tag), used to build the dispatch event
+
     """
     print(
         f"::group::Publishing {image_config['name']} to the server {name} using the tags {', '.join(dst_tags)}"
@@ -411,6 +397,7 @@ def helm(folder: str, version: str, owner: str, repo: str, commit_sha: str, toke
         repo: The GitHub repository name
         commit_sha: The sha of the current commit
         token: The GitHub token
+
     """
     print(f"::group::Publishing Helm chart from '{folder}' to GitHub release")
     sys.stdout.flush()

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

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

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/scripts/clean.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 
-"""
-The clean main function.
-"""
+"""The clean main function."""
 
 import argparse
 import json
@@ -24,6 +22,7 @@ def clean(image: str, tag: str, token: str) -> None:
         image: The image name that should be deleted (<organization>/<name>)
         tag: The tag that should be deleted
         token: The token used to be authenticated on Docker hub
+
     """
     print(f"Delete image '{image}:{tag}'.")
 
@@ -51,9 +50,7 @@ def clean(image: str, tag: str, token: str) -> None:
 
 
 def main() -> None:
-    """
-    Run the main function.
-    """
+    """Run the main function."""
     parser = argparse.ArgumentParser(
         description=(
             "Clean the Docker images on Docker Hub for the branch we delete "
@@ -87,10 +84,7 @@ def main() -> None:
     with open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8") as event_file:
         event = json.loads(event_file.read())
         print(yaml.dump(event))
-        if "pull_request" in event:
-            ref = str(event["number"])
-        else:
-            ref = event["ref"]
+        ref = str(event["number"]) if "pull_request" in event else event["ref"]
 
     ref = ref.replace("/", "_")
 

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/scripts/docker_logs.py

@@ -21,7 +21,7 @@ def main() -> None:
 
     if os.path.exists("docker-compose.yaml"):
         _print("::group::Docker Compose ps")
-        subprocess.run(["docker", "compose", "ps"], check=False)
+        subprocess.run(["docker", "compose", "ps", "--all"], check=False)
         _print("::endgroup::")
 
     _print("::group::Docker ps")
@@ -30,11 +30,11 @@ def main() -> None:
 
     # 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"):
-        with open("/tmp/docker-logs-timestamp", encoding="utf-8") as timestamp_file:
+    if os.path.exists("/tmp/docker-logs-timestamp"):  # noqa: S108
+        with open("/tmp/docker-logs-timestamp", encoding="utf-8") as timestamp_file:  # noqa: S108
             timestamp_args = [f"--since={timestamp_file.read().strip()}Z"]
 
-    with open("/tmp/docker-logs-timestamp", "w", encoding="utf-8") as timestamp_file:
+    with open("/tmp/docker-logs-timestamp", "w", encoding="utf-8") as timestamp_file:  # noqa: S108
         timestamp_file.write(datetime.utcnow().isoformat())
 
     for name in (

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/scripts/env.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 
-"""
-The checker main function.
-"""
+"""The checker main function."""
 
 import argparse
 
@@ -10,9 +8,7 @@ import c2cciutils.env
 
 
 def main() -> None:
-    """
-    Run the checks.
-    """
+    """Run the checks."""
     parser = argparse.ArgumentParser(description="Print the environment information.")
     parser.parse_args()
 

c2cciutils-1.8.0.dev45/c2cciutils/scripts/k8s/__init__.py

@@ -0,0 +1 @@
+"""The commands that can be used to test a chart on Kubernetes."""

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/scripts/main.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 
-"""
-The main function of some utilities.
-"""
+"""The main function of some utilities."""
 
 import argparse
 
@@ -13,9 +11,7 @@ import c2cciutils
 
 
 def main() -> None:
-    """
-    Run the utilities.
-    """
+    """Run the utilities."""
     parser = argparse.ArgumentParser(description="Some utils of c2cciutils.")
     parser.add_argument("--get-config", action="store_true", help="display the current config")
     parser.add_argument("--version", action="store_true", help="display the current version")

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/scripts/publish.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 
-"""
-The publish script.
-"""
+"""The publish script."""
 
 import argparse
 import os
@@ -34,6 +32,7 @@ def match(tpe: str, base_re: str) -> Optional[Match[str]]:
     Arguments:
         tpe: The type of ref we want to match (heads, tag, ...)
         base_re: The regular expression to match the value
+
     """
     if base_re[0] == "^":
         base_re = base_re[1:]
@@ -50,6 +49,7 @@ def to_version(full_config: c2cciutils.configuration.Configuration, value: str,
         full_config: The full configuration
         value: The value to be transformed
         kind: The name of the transformer in the configuration
+
     """
     item_re = c2cciutils.compile_re(
         cast(
@@ -63,9 +63,7 @@ def to_version(full_config: c2cciutils.configuration.Configuration, value: str,
 
 
 def main() -> None:
-    """
-    Run the publish.
-    """
+    """Run the publish."""
     parser = argparse.ArgumentParser(description="Publish the project.")
     parser.add_argument("--group", default="default", help="The publishing group")
     parser.add_argument("--version", help="The version to publish to")
@@ -311,23 +309,22 @@ def main() -> None:
                                         conf, name, image_conf, tag_src, tags, images_full
                                     )
 
-                    if google_calendar_publish:
-                        if version_type in google_calendar_config.get(
-                            "on", c2cciutils.configuration.PUBLISH_GOOGLE_CALENDAR_ON_DEFAULT
-                        ):
-                            if not google_calendar:
-                                google_calendar = GoogleCalendar()
-                            summary = f"{image_conf['name']}:{', '.join(tags_calendar)}"
-                            description = "\n".join(
-                                [
-                                    f"Published the image {image_conf['name']}",
-                                    f"Published on: {', '.join(docker_config['repository'].keys())}",
-                                    f"With tags: {', '.join(tags_calendar)}",
-                                    f"For version type: {version_type}",
-                                ]
-                            )
+                    if google_calendar_publish and version_type in google_calendar_config.get(
+                        "on", c2cciutils.configuration.PUBLISH_GOOGLE_CALENDAR_ON_DEFAULT
+                    ):
+                        if not google_calendar:
+                            google_calendar = GoogleCalendar()
+                        summary = f"{image_conf['name']}:{', '.join(tags_calendar)}"
+                        description = "\n".join(
+                            [
+                                f"Published the image {image_conf['name']}",
+                                f"Published on: {', '.join(docker_config['repository'].keys())}",
+                                f"With tags: {', '.join(tags_calendar)}",
+                                f"For version type: {version_type}",
+                            ]
+                        )
 
-                            google_calendar.create_event(summary, description)
+                        google_calendar.create_event(summary, description)
 
         if args.dry_run:
             sys.exit(0)

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/scripts/trigger_image_update.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 
-"""
-Trigger an image update on the argocd repository.
-"""
+"""Trigger an image update on the argocd repository."""
 
 import argparse
 import os.path
@@ -60,10 +58,8 @@ def main() -> None:
 
 
 def dispatch(repository: str, event_type: str, images_full: list[str]) -> None:
-    """
-    Trigger an image update on the argocd repository.
-    """
-    id_ = random.randint(1, 100000)  # nosec
+    """Trigger an image update on the argocd repository."""
+    id_ = random.randint(1, 100000)  # noqa: S311
     print(f"Triggering {event_type}:{id_} on {repository} with {','.join(images_full)}")
 
     response = requests.post(

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/c2cciutils/scripts/version.py

@@ -149,9 +149,11 @@ If you run the tool without any version it will check that everything is OK rega
     stabilization_branches_with_master = [*stabilization_branches, repo.get("master_branch", "master")]
 
     for labels in mra.gh_json("label", ["name"], "list"):
-        if labels["name"].startswith("backport "):
-            if labels["name"].replace("backport ", "") not in stabilization_branches_with_master:
-                mra.gh("label", "delete", labels["name"], "--yes")
+        if (
+            labels["name"].startswith("backport ")
+            and labels["name"].replace("backport ", "") not in stabilization_branches_with_master
+        ):
+            mra.gh("label", "delete", labels["name"], "--yes")
 
     for branch in stabilization_branches_with_master:
         mra.gh(

{c2cciutils-1.7.3.dev2 → c2cciutils-1.8.0.dev45}/pyproject.toml

@@ -19,7 +19,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cciutils"
-version = "1.7.3.dev2"
+version = "1.8.0.dev45"
 description = "Common utilities for Camptocamp CI"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -65,17 +65,17 @@ c2cciutils-docker-versions-gen = "c2cciutils.scripts.docker_versions_gen:main"
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
 requests = "2.32.3"
-google-api-python-client = { version = "2.148.0", optional = true }
+google-api-python-client = { version = "2.157.0", optional = true }
 google-auth-httplib2 = { version = "0.2.0", optional = true }
 google-auth-oauthlib = { version = "1.2.1", optional = true }
-"ruamel.yaml" = "0.18.6"
+"ruamel.yaml" = "0.18.9"
 defusedxml = "0.7.1"
-twine = { version = "5.1.1", optional = true }
+twine = { version = "6.0.1", optional = true }
 debian-inspector = "31.1.0"
 PyYAML = "6.0.2"
-multi-repo-automation = { version="1.3.0", optional = true }
-security-md = "0.2.3"
-id = { version="1.4.0", optional = true }
+multi-repo-automation = { version="1.5.0", optional = true }
+security-md = "1.0.0"
+id = { version="1.5.0", optional = true }
 
 [tool.poetry.extras]
 audit = []
@@ -86,11 +86,11 @@ pr_checks = []
 version = ["multi-repo-automation"]
 
 [tool.poetry.group.dev.dependencies]
-prospector = { version = "1.12.1", extras = ["with-bandit", "with-mypy", "with-pyroma"] }
-prospector-profile-duplicated = "1.6.0"
-prospector-profile-utils = "1.9.1"
+prospector = { version = "1.13.3", extras = ["with-bandit", "with-mypy", "with-pyroma", "with-ruff"] }
+prospector-profile-duplicated = "1.10.4"
+prospector-profile-utils = "1.15.1"
 types-requests = "2.32.0.20241016"
-types-pyyaml = "6.0.12.20241221"
+types-pyyaml = "6.0.12.20241230"
 types-markdown = "3.7.0.20241204"
 
 [build-system]

c2cciutils-1.7.3.dev2/c2cciutils/scripts/__init__.py

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

c2cciutils-1.7.3.dev2/c2cciutils/scripts/k8s/__init__.py

@@ -1,3 +0,0 @@
-"""
-The commands that can be used to test a chart on Kubernetes.
-"""