c2cciutils 1.7.0.dev173__py3-none-any.whl → 1.7.3.dev2__py3-none-any.whl

c2cciutils/publish.py

@@ -10,11 +10,11 @@ import pickle  # nosec
 import re
 import subprocess  # nosec
 import sys
+import tomllib
 import uuid
 from typing import Optional
 
 import ruamel.yaml
-import tomlkit
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
 from google_auth_oauthlib.flow import InstalledAppFlow
@@ -61,7 +61,7 @@ class GoogleCalendar:
         self._update_creds()
         self.service = build("calendar", "v3", credentials=self.creds)
 
-    def init_calendar_service(self) -> Credentials:
+    def init_calendar_service(self) -> Credentials:  # type: ignore
         """
         Initialize the calendar service.
         """
@@ -72,12 +72,12 @@ class GoogleCalendar:
             with open(self.credentials_pickle_file, "rb") as token:
                 creds = pickle.load(token)  # nosec
         # If there are no (valid) credentials available, let the user log in.
-        if not creds or not creds.valid:
+        if not creds or not creds.valid:  # pylint: disable=possibly-used-before-assignment
             if creds and creds.expired and creds.refresh_token:
-                creds.refresh(Request())
+                creds.refresh(Request())  # type: ignore
             else:
                 if self.token:
-                    creds = Credentials(
+                    creds = Credentials(  # type: ignore
                         self.token,
                         refresh_token=self.refresh_token,
                         token_uri=self.token_uri,
@@ -177,13 +177,6 @@ class GoogleCalendar:
         event_result = self.service.events().insert(calendarId=self.calendar_id, body=body).execute()
         print(f"Created event with id: {event_result['id']}")
 
-    def _print_credentials(self) -> None:
-        """
-        Print the credentials.
-        """
-        # UNSAFE: DO NEVER PRINT CREDENTIALS IN CI ENVIRONMENT, DEBUG ONLY!!!!
-        print(self.creds.to_json())
-
     def save_credentials_to_gopass(self) -> None:
         """
         Save the calendar credentials to gopass.
@@ -201,6 +194,9 @@ class GoogleCalendar:
             c2cciutils.gopass_put(secret, key)
 
     def __del__(self) -> None:
+        """
+        Delete the credentials file.
+        """
         if os.path.exists(self.credentials_pickle_file):
             os.remove(self.credentials_pickle_file)
 
@@ -235,7 +231,9 @@ def main_calendar() -> None:
         parser.print_help()
 
     if args.show_events_since:
-        google_calendar.print_latest_events(args.show_events_since)
+        google_calendar.print_latest_events(  # pylint: disable=possibly-used-before-assignment
+            args.show_events_since
+        )
 
     if args.refresh_gopass_credentials:
         google_calendar.save_credentials_to_gopass()
@@ -257,7 +255,6 @@ def pip(
         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()
     sys.stderr.flush()
@@ -292,8 +289,8 @@ def pip(
             if os.path.exists(os.path.join(cwd, "pyproject.toml")):
                 use_poetry = False
                 if "build_command" not in package:
-                    with open(os.path.join(cwd, "pyproject.toml"), encoding="utf-8") as project_file:
-                        pyproject = tomlkit.load(project_file)
+                    with open(os.path.join(cwd, "pyproject.toml"), "rb") as project_file:
+                        pyproject = tomllib.load(project_file)
                     re_splitter = re.compile(r"[<>=]+")
                     for requirement in pyproject.get("build-system", {}).get("requires", []):
                         requirement_split = re_splitter.split(requirement)
@@ -356,7 +353,6 @@ def docker(
         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)}"
     )
@@ -416,7 +412,6 @@ def helm(folder: str, version: str, owner: str, repo: str, commit_sha: str, toke
         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()
     sys.stderr.flush()

c2cciutils/schema.json

@@ -6,197 +6,6 @@
   "description": "C2C CI utils configuration file",
   "additionalProperties": false,
   "definitions": {
-    "audit_outdated_versions": {
-      "title": "Audit outdated versions",
-      "description": "Audit of outdated version",
-      "type": "boolean"
-    },
-    "audit_snyk": {
-      "title": "Audit with Snyk",
-      "description": "The audit Snyk configuration",
-      "oneOf": [
-        {
-          "title": "Audit Snyk config",
-          "description": "The audit Pipfile configuration",
-          "type": "object",
-          "properties": {
-            "test_arguments": {
-              "description": "The Snyk test arguments",
-              "title": "audit snyk test arguments",
-              "default": ["--all-projects", "--fail-on=all", "--severity-threshold=medium"],
-              "type": "array",
-              "items": { "type": "string" }
-            },
-            "monitor_arguments": {
-              "description": "The Snyk monitor arguments",
-              "title": "audit snyk monitor arguments",
-              "default": ["--all-projects"],
-              "type": "array",
-              "items": { "type": "string" }
-            },
-            "fix_arguments": {
-              "description": "The Snyk fix arguments",
-              "title": "audit snyk fix arguments",
-              "default": ["--all-projects"],
-              "type": "array",
-              "items": { "type": "string" }
-            },
-            "fix_github_create_pull_request_arguments": {
-              "description": "The Snyk fix pull request extra arguments",
-              "title": "audit snyk fix pull request arguments",
-              "default": ["--fill", "--label=dependencies"],
-              "type": "array",
-              "items": { "type": "string" }
-            },
-            "pip_install_arguments": {
-              "description": "The Snyk pip install arguments",
-              "title": "audit snyk pip install arguments",
-              "default": ["--user"],
-              "type": "array",
-              "items": { "type": "string" }
-            },
-            "pipenv_sync_arguments": {
-              "description": "The Snyk pipenv sync arguments",
-              "title": "audit snyk pipenv sync arguments",
-              "default": [],
-              "type": "array",
-              "items": { "type": "string" }
-            },
-            "files_no_install": {
-              "description": "The list of files to not install",
-              "title": "audit snyk files no install",
-              "default": [],
-              "type": "array",
-              "items": { "type": "string" }
-            }
-          }
-        },
-        { "type": "boolean" }
-      ]
-    },
-    "codespell": {
-      "title": "Codespell",
-      "description": "The codespell check configuration",
-      "type": "object",
-      "properties": {
-        "internal_dictionaries": {
-          "title": "codespell dictionaries",
-          "description": "List of argument that will be added to the codespell command",
-          "default": ["clear", "rare", "informal", "code", "names", "en-GB_to_en-US"],
-          "type": "array",
-          "items": { "type": "string" }
-        },
-        "arguments": {
-          "title": "codespell arguments",
-          "description": "List of argument that will be added to the codespell command",
-          "default": ["--quiet-level=2", "--check-filenames", "--ignore-words-list=ro"],
-          "type": "array",
-          "items": { "type": "string" }
-        },
-        "ignore_re": {
-          "title": "codespell ignore regular expression",
-          "description": "List of regular expression that should be ignored",
-          "default": ["(.*/)?poetry\\.lock", "(.*/)?package-lock\\.json"],
-          "type": "array",
-          "items": { "type": "string" }
-        }
-      }
-    },
-    "pr_checks_commits_messages": {
-      "title": "pull request checks commits messages",
-      "description": "Check the pull request commits messages",
-      "oneOf": [
-        {
-          "title": "pull request checks commits messages configuration",
-          "description": "The commit message check configuration",
-          "type": "object",
-          "properties": {
-            "check_fixup": {
-              "title": "pull request checks commits messages fixup",
-              "description": "Check that we don't have one fixup commit in the pull request",
-              "default": true,
-              "type": "boolean"
-            },
-            "check_squash": {
-              "title": "pull request checks commits messages squash",
-              "description": "Check that we don't have one squash commit in the pull request",
-              "default": true,
-              "type": "boolean"
-            },
-            "check_first_capital": {
-              "title": "pull request checks commits messages first capital",
-              "description": "Check that the all the commits message starts with a capital letter",
-              "default": true,
-              "type": "boolean"
-            },
-            "min_head_length": {
-              "title": "pull request checks commits messages min head length",
-              "description": "Check that the commits message head is at least this long, use 0 to disable",
-              "default": 5,
-              "type": "integer"
-            },
-            "check_no_merge_commits": {
-              "title": "pull request checks commits messages no merge commits",
-              "description": "Check that we don't have merge commits in the pull request",
-              "default": true,
-              "type": "boolean"
-            },
-            "check_no_own_revert": {
-              "title": "pull request checks commits messages no own revert",
-              "description": "Check that we don't have reverted one of our commits in the pull request",
-              "default": true,
-              "type": "boolean"
-            }
-          }
-        },
-        { "type": "boolean" }
-      ]
-    },
-    "pr_checks_commits_spell": {
-      "title": "pull request checks commits spelling",
-      "oneOf": [
-        {
-          "title": "pull request checks commits spelling configuration",
-          "description": "Configuration used to check the spelling of the commits",
-          "type": "object",
-          "properties": {
-            "only_head": {
-              "title": "pull request checks commits messages only head",
-              "default": true,
-              "type": "boolean"
-            }
-          }
-        },
-        { "type": "boolean" }
-      ]
-    },
-    "pr_checks_pull_request_spell": {
-      "title": "pull request checks pull request spelling",
-      "oneOf": [
-        {
-          "title": "pull request checks pull request spelling configuration",
-          "description": "Configuration used to check the spelling of the title and body of the pull request",
-          "type": "object",
-          "properties": {
-            "only_head": {
-              "title": "pull request checks only head",
-              "default": true,
-              "type": "boolean"
-            }
-          }
-        },
-        { "type": "boolean" }
-      ]
-    },
-    "pr_checks_pull_request_labels": {
-      "title": "pull request checks request labels",
-      "description": "According the create changelog configuration",
-      "type": "boolean"
-    },
-    "pr_checks_add_issue_link": {
-      "title": "pull request checks add issue link",
-      "type": "boolean"
-    },
     "publish_docker": {
       "title": "Publish Docker",
       "description": "The configuration used to publish on Docker",
@@ -451,18 +260,15 @@
           "title": "Print versions versions",
           "type": "array",
           "default": [
-            { "name": "c2cciutils", "cmd": ["c2cciutils", "--version"] },
             { "name": "python", "cmd": ["python3", "--version"] },
             { "name": "pip", "cmd": ["python3", "-m", "pip", "--version"] },
-            { "name": "twine", "cmd": ["twine", "--version"] },
             { "name": "node", "prefix": "node ", "cmd": ["node", "--version"] },
             { "name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"] },
-            { "name": "make", "cmd": ["make", "--version"], "prefix": "make " },
+            { "name": "make", "cmd": ["make", "--version"] },
             { "name": "docker", "cmd": ["docker", "--version"] },
-            { "name": "docker-compose", "cmd": ["docker-compose", "--version"] },
+            { "name": "docker compose", "cmd": ["docker", "compose", "version"] },
             { "name": "java", "cmd": ["java", "-version"] },
-            { "name": "kubectl", "cmd": ["kubectl", "version"] },
-            { "name": "helm", "cmd": ["helm", "version"] }
+            { "name": "helm", "cmd": ["helm", "version"], "prefix": "HELM: " }
           ],
           "items": {
             "type": "object",
@@ -506,39 +312,6 @@
   },
   "properties": {
     "print_versions": { "$ref": "#/definitions/print_versions" },
-    "codespell": { "$ref": "#/definitions/codespell" },
-    "audit": {
-      "title": "Audit",
-      "description": "The audit configuration",
-      "type": "object",
-      "default": {
-        "snyk": true,
-        "outdated_versions": true
-      },
-      "properties": {
-        "outdated_versions": { "$ref": "#/definitions/audit_outdated_versions" },
-        "snyk": { "$ref": "#/definitions/audit_snyk" }
-      }
-    },
-    "pr-checks": {
-      "title": "Pull request checks",
-      "description": "The PR check configuration",
-      "type": "object",
-      "default": {
-        "commits_messages": true,
-        "commits_spell": true,
-        "pull_request_spell": true,
-        "pull_request_labels": true,
-        "add_issue_link": true
-      },
-      "properties": {
-        "commits_messages": { "$ref": "#/definitions/pr_checks_commits_messages" },
-        "commits_spell": { "$ref": "#/definitions/pr_checks_commits_spell" },
-        "pull_request_spell": { "$ref": "#/definitions/pr_checks_pull_request_spell" },
-        "pull_request_labels": { "$ref": "#/definitions/pr_checks_pull_request_labels" },
-        "add_issue_link": { "$ref": "#/definitions/pr_checks_add_issue_link" }
-      }
-    },
     "publish": {
       "title": "Publish",
       "description": "The publishing configurations",

c2cciutils/scripts/clean.py

@@ -25,7 +25,6 @@ def clean(image: str, tag: str, token: str) -> None:
         tag: The tag that should be deleted
         token: The token used to be authenticated on Docker hub
     """
-
     print(f"Delete image '{image}:{tag}'.")
 
     response = requests.head(

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"], check=False)
         _print("::endgroup::")
 
     _print("::group::Docker ps")

c2cciutils/scripts/docker_versions_gen.py

@@ -7,7 +7,6 @@ import c2cciutils.lib.docker
 
 def main() -> None:
     """Dump the actual versions of packages in image to file ci/dpkg-versions.yaml."""
-
     argparser = argparse.ArgumentParser(
         description="Dump the actual versions of packages in image to file ci/dpkg-versions.yaml."
     )

c2cciutils/scripts/download_applications.py

@@ -17,7 +17,6 @@ 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,
@@ -60,7 +59,6 @@ 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)

c2cciutils/scripts/k8s/wait.py

@@ -54,7 +54,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}')
+        print(f'::group::Container not ready in {pod["metadata"]["name"]}: {status_message}')  # noqa: E713
         if status_message_long != status_message:
             print(status_message_long)
         print(json.dumps(status, indent=4))
@@ -68,7 +68,7 @@ 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"])}'
+                    f'::group::Pod not ready in {pod["metadata"]["name"]}: {condition.get("message", condition["type"])}'  # noqa: E713
                 )
                 print(json.dumps(condition, indent=4))
                 print("::endgroup::")

c2cciutils/scripts/main.py

@@ -19,7 +19,6 @@ def main() -> None:
     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")
-    parser.add_argument("--ls-files-mime", help="List all the files with the specified mime type")
 
     args = parser.parse_args()
 
@@ -27,15 +26,8 @@ def main() -> None:
         print(yaml.dump(c2cciutils.get_config(), default_flow_style=False, Dumper=yaml.SafeDumper))
 
     if args.version:
-        for pkg in ("c2cciutils", "black", "isort"):
-            try:
-                print(f"{pkg} {pkg_resources.get_distribution(pkg).version}")
-            except pkg_resources.DistributionNotFound:
-                print(f"{pkg} missing")
-
-    if args.ls_files_mime:
-        for file_name in c2cciutils.get_git_files_mime(args.ls_files_mime):
-            print(file_name)
+        version = pkg_resources.get_distribution("c2cciutils").version
+        print(f"c2cciutils {version}")
 
 
 if __name__ == "__main__":

c2cciutils/scripts/publish.py

@@ -13,15 +13,16 @@ from re import Match
 from typing import Optional, cast
 
 import requests
+import security_md
 import yaml
 
 import c2cciutils
 import c2cciutils.configuration
 import c2cciutils.env
 import c2cciutils.lib.docker
+import c2cciutils.lib.oidc
 import c2cciutils.publish
 import c2cciutils.scripts.download_applications
-import c2cciutils.security
 from c2cciutils.publish import GoogleCalendar
 from c2cciutils.scripts.trigger_image_update import dispatch
 
@@ -170,6 +171,9 @@ def main() -> None:
         config.get("publish", {}).get("pypi", {}) if config.get("publish", {}).get("pypi", False) else {},
     )
     if pypi_config:
+        if pypi_config["packages"]:
+            c2cciutils.lib.oidc.pypi_login()
+
         for package in pypi_config["packages"]:
             if package.get("group", c2cciutils.configuration.PUBLISH_PIP_PACKAGE_GROUP_DEFAULT) == args.group:
                 publish = version_type in pypi_config.get("versions", [])
@@ -213,11 +217,9 @@ def main() -> None:
                 print(f"::error:: {security_response.status_code} {security_response.text}")
                 sys.exit(1)
 
-        security = c2cciutils.security.Security(security_text)
-        version_index = security.headers.index("Version") if "Version" in security.headers else -1
-        alternate_tag_index = (
-            security.headers.index("Alternate Tag") if "Alternate Tag" in security.headers else -1
-        )
+        security = security_md.Security(security_text)
+        version_index = security.version_index
+        alternate_tag_index = security.alternate_tag_index
 
         row_index = -1
         if version_index >= 0:
@@ -392,19 +394,34 @@ def main() -> None:
             dpkg_success &= c2cciutils.lib.docker.check_versions(versions_config.get(image, {}), image)
 
         if not dpkg_success:
-            current_versions_in_images = {}
-            if os.path.exists("ci/dpkg-versions.yaml"):
+            current_versions_in_images: dict[str, dict[str, str]] = {}
+            if dpkg_config_found:
                 with open("ci/dpkg-versions.yaml", encoding="utf-8") as dpkg_versions_file:
                     current_versions_in_images = yaml.load(dpkg_versions_file, Loader=yaml.SafeLoader)
             for image in images_src:
+                if image in current_versions_in_images:
+                    current_versions_in_images[image] = dict(current_versions_in_images[image])
                 _, versions_image = c2cciutils.lib.docker.get_dpkg_packages_versions(image)
-                current_versions_in_images[image] = {k: str(v) for k, v in versions_image.items()}
+                for dpkg_package, package_version in versions_image.items():
+                    if dpkg_package not in current_versions_in_images.get(image, {}):
+                        current_versions_in_images.setdefault(image, {})[dpkg_package] = str(package_version)
+                for dpkg_package in list(current_versions_in_images[image].keys()):
+                    if dpkg_package not in versions_image:
+                        del current_versions_in_images[image][dpkg_package]
             if dpkg_config_found:
                 print(
                     "::error::Some packages are have a greater version in the config raster then in the image."
                 )
             print("Current versions of the Debian packages in Docker images:")
             print(yaml.dump(current_versions_in_images, Dumper=yaml.SafeDumper, default_flow_style=False))
+            if dpkg_config_found:
+                with open("ci/dpkg-versions.yaml", "w", encoding="utf-8") as dpkg_versions_file:
+                    yaml.dump(
+                        current_versions_in_images,
+                        dpkg_versions_file,
+                        Dumper=yaml.SafeDumper,
+                        default_flow_style=False,
+                    )
 
             if dpkg_config_found:
                 success = False

c2cciutils/scripts/trigger_image_update.py

@@ -63,7 +63,6 @@ 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
     print(f"Triggering {event_type}:{id_} on {repository} with {','.join(images_full)}")
 

c2cciutils/scripts/version.py

@@ -14,7 +14,6 @@ import c2cciutils
 
 def main() -> None:
     """Create a new version with its stabilization branch."""
-
     args_parser = argparse.ArgumentParser(
         description="Create a new version with its stabilization branch",
         usage="""

{c2cciutils-1.7.0.dev173.dist-info → c2cciutils-1.7.3.dev2.dist-info}/LICENSE

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