c2cciutils 1.8.0.dev49__tar.gz → 1.8.0.dev51__tar.gz

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cciutils
-Version: 1.8.0.dev49
+Version: 1.8.0.dev51
 Summary: Common utilities for Camptocamp CI
 Home-page: https://github.com/camptocamp/c2cciutils
 License: FreeBSD

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/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.3.5 # helm - https://charts.bitnami.com/bitnami
+k3d-io/k3d: v5.8.1 # github-releases
+postgresql: 16.4.5 # helm - https://charts.bitnami.com/bitnami
 helm/chart-releaser: v1.7.0 # github-releases

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/c2cciutils/lib/oidc.py

@@ -45,12 +45,12 @@ use them to configure a trusted publisher unless they already match your expecta
 
 If a claim is not present in the claim set, then it is rendered as `MISSING`.
 
-* `sub`: `{claims.get('sub', 'MISSING')}`
-* `repository`: `{claims.get('repository', 'MISSING')}`
-* `repository_owner`: `{claims.get('repository_owner', 'MISSING')}`
-* `repository_owner_id`: `{claims.get('repository_owner_id', 'MISSING')}`
-* `job_workflow_ref`: `{claims.get('job_workflow_ref', 'MISSING')}`
-* `ref`: `{claims.get('ref')}`
+* `sub`: `{claims.get("sub", "MISSING")}`
+* `repository`: `{claims.get("repository", "MISSING")}`
+* `repository_owner`: `{claims.get("repository_owner", "MISSING")}`
+* `repository_owner_id`: `{claims.get("repository_owner_id", "MISSING")}`
+* `job_workflow_ref`: `{claims.get("job_workflow_ref", "MISSING")}`
+* `ref`: `{claims.get("ref")}`
 
 See https://docs.pypi.org/trusted-publishers/troubleshooting/ for more help.
 """
@@ -112,7 +112,7 @@ You can monitor PyPI's status here: https://status.python.org/
     # occurred during minting.
     if not mint_token_resp.ok:
         reasons = "\n".join(
-            f'* `{error["code"]}`: {error["description"]}'
+            f"* `{error['code']}`: {error['description']}"
             for error in mint_token_payload["errors"]  # noqa: W604
         )
 

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/c2cciutils/package-lock.json

@@ -8,7 +8,7 @@
       "name": "c2ccicheck",
       "version": "1.0.0",
       "dependencies": {
-        "snyk": "1.1294.3"
+        "snyk": "1.1295.2"
       }
     },
     "node_modules/@sentry-internal/tracing": {
@@ -332,9 +332,9 @@
       }
     },
     "node_modules/snyk": {
-      "version": "1.1294.3",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1294.3.tgz",
-      "integrity": "sha512-ZF+F2bv293HmpFxZCV0x8hT3rQGOl6rPDoJq/TqBT1i5/nZypfn8v4A1Q4m6zUSUs1g6WJsS8QR5wTlR/eSvMQ==",
+      "version": "1.1295.2",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1295.2.tgz",
+      "integrity": "sha512-Unl6HD/XF2DfDEj4pySiQF5bUkc6yS/tljtO9LHgjJjfj4CRGZdNs2HmtfEJHsnda3pqBEUO71L7PXhgouzYGw==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/c2cciutils/package.json

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

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/c2cciutils/publish.py

@@ -28,7 +28,7 @@ class GoogleCalendar:
     def __init__(self) -> None:
         """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")  # noqa: S108
+        self.credentials_pickle_file = os.environ.get("TMP_CREDS_FILE", f"/tmp/{uuid.uuid4()}.pickle")  # noqa: S108 # nosec
         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,7 +62,7 @@ class GoogleCalendar:
         # time.
         if os.path.exists(self.credentials_pickle_file):
             with open(self.credentials_pickle_file, "rb") as token:
-                creds = pickle.load(token)  # noqa: S301
+                creds = pickle.load(token)  # noqa: S301 # nosec
         # 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:
@@ -99,7 +99,7 @@ class GoogleCalendar:
         # list all the calendars that the user has access to.
         # used to debug credentials
         print("Getting list of calendars")
-        calendars_result = self.service.calendarList().list().execute()
+        calendars_result = self.service.calendarList().list().execute()  # pylint: disable=no-member
 
         calendars = calendars_result.get("items", [])
 
@@ -123,7 +123,7 @@ class GoogleCalendar:
         if not time_min:
             time_min = datetime.datetime.utcnow() - datetime.timedelta(days=30)
         events_result = (
-            self.service.events()
+            self.service.events()  # pylint: disable=no-member
             .list(
                 calendarId=self.calendar_id,
                 timeMin=time_min.isoformat() + "Z",
@@ -164,7 +164,7 @@ class GoogleCalendar:
             "end": {"dateTime": end, "timeZone": "Europe/Zurich"},
         }
 
-        event_result = self.service.events().insert(calendarId=self.calendar_id, body=body).execute()
+        event_result = self.service.events().insert(calendarId=self.calendar_id, body=body).execute()  # pylint: disable=no-member
         print(f"Created event with id: {event_result['id']}")
 
     def save_credentials_to_gopass(self) -> None:

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/c2cciutils/scripts/docker_logs.py

@@ -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"):  # noqa: S108
-        with open("/tmp/docker-logs-timestamp", encoding="utf-8") as timestamp_file:  # noqa: S108
+    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_args = [f"--since={timestamp_file.read().strip()}Z"]
 
-    with open("/tmp/docker-logs-timestamp", "w", encoding="utf-8") as timestamp_file:  # noqa: S108
+    with open("/tmp/docker-logs-timestamp", "w", encoding="utf-8") as timestamp_file:  # noqa: S108 # nosec
         timestamp_file.write(datetime.utcnow().isoformat())
 
     for name in (

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/c2cciutils/scripts/k8s/wait.py

@@ -11,13 +11,13 @@ from typing import Any
 def _check_deployment_status(deployments: Any) -> bool:
     for deployment in deployments["items"]:
         if not deployment["status"]:
-            print(f'Waiting status for {deployment["metadata"]["name"]}')
+            print(f"Waiting status for {deployment['metadata']['name']}")
             return False
 
         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::")
@@ -25,7 +25,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)} '
+                f"::group::Deployment {deployment['metadata']['name']} not ready there is {deployment['status'].get('unavailableReplicas', 0)} "
                 "unavailable replicas"
             )
             print(json.dumps(deployment["status"], indent=4))
@@ -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}')  # noqa: E713
+        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"])}'  # noqa: E713
+                    f"::group::Pod not ready in {pod['metadata']['name']}: {condition.get('message', condition['type'])}"  # noqa: E713
                 )
                 print(json.dumps(condition, indent=4))
                 print("::endgroup::")
@@ -82,7 +82,7 @@ def _check_pod_status(pods: Any) -> bool:
                 return False
 
         if pod["status"].get("phase") not in ("Running", "Succeeded"):
-            print(f'::group::The Pod {pod["metadata"]["name"]} is not ready: {pod["status"].get("phase")}')
+            print(f"::group::The Pod {pod['metadata']['name']} is not ready: {pod['status'].get('phase')}")
             return False
 
     return True

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/c2cciutils/scripts/trigger_image_update.py

@@ -59,7 +59,7 @@ 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)  # noqa: S311
+    id_ = random.randint(1, 100000)  # noqa: S311 # nosec
     print(f"Triggering {event_type}:{id_} on {repository} with {','.join(images_full)}")
 
     response = requests.post(

{c2cciutils-1.8.0.dev49 → c2cciutils-1.8.0.dev51}/pyproject.toml

@@ -19,7 +19,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cciutils"
-version = "1.8.0.dev49"
+version = "1.8.0.dev51"
 description = "Common utilities for Camptocamp CI"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -65,12 +65,12 @@ 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.157.0", optional = true }
+google-api-python-client = { version = "2.160.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.10"
 defusedxml = "0.7.1"
-twine = { version = "6.0.1", optional = true }
+twine = { version = "6.1.0", optional = true }
 debian-inspector = "31.1.0"
 PyYAML = "6.0.2"
 multi-repo-automation = { version="1.5.0", optional = true }
@@ -86,9 +86,9 @@ pr_checks = []
 version = ["multi-repo-automation"]
 
 [tool.poetry.group.dev.dependencies]
-prospector = { version = "1.13.3", extras = ["with-bandit", "with-mypy", "with-pyroma", "with-ruff"] }
+prospector = { version = "1.14.0", extras = ["with-bandit", "with-mypy", "with-pyroma", "with-ruff"] }
 prospector-profile-duplicated = "1.10.4"
-prospector-profile-utils = "1.15.1"
+prospector-profile-utils = "1.17.0"
 types-requests = "2.32.0.20241016"
 types-pyyaml = "6.0.12.20241230"
 types-markdown = "3.7.0.20241204"