c2cciutils 1.7.4.dev128__tar.gz → 1.7.5__tar.gz

{c2cciutils-1.7.4.dev128 → c2cciutils-1.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cciutils
-Version: 1.7.4.dev128
+Version: 1.7.5
 Summary: Common utilities for Camptocamp CI
 Home-page: https://github.com/camptocamp/c2cciutils
 License: FreeBSD
@@ -31,9 +31,6 @@ Provides-Extra: version
 Requires-Dist: PyYAML (>=6.0.0,<7.0.0)
 Requires-Dist: debian-inspector (>=31.0.0,<32.0.0)
 Requires-Dist: defusedxml (>=0.0.0,<1.0.0)
-Requires-Dist: google-api-python-client (>=2.0.0,<3.0.0) ; extra == "publish"
-Requires-Dist: google-auth-httplib2 (>=0.0.0,<1.0.0) ; extra == "publish"
-Requires-Dist: google-auth-oauthlib (>=1.0.0,<2.0.0) ; extra == "publish"
 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)

{c2cciutils-1.7.4.dev128 → c2cciutils-1.7.5}/c2cciutils/publish.py

@@ -2,246 +2,19 @@
 The publishing functions.
 """
 
-import argparse
 import datetime
 import glob
 import os
-import pickle  # nosec
 import re
 import subprocess  # nosec
 import sys
 import tomllib
-import uuid
-from typing import Optional
 
 import ruamel.yaml
-from google.auth.transport.requests import Request
-from google.oauth2.credentials import Credentials
-from google_auth_oauthlib.flow import InstalledAppFlow
-from googleapiclient.discovery import build
 
 import c2cciutils.configuration
 
 
-class GoogleCalendar:
-    """
-    Interact with the Google Calendar API.
-    """
-
-    # pylint: disable=too-many-instance-attributes
-    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")
-        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
-        self.calendar_id = os.environ.get(
-            "GOOGLE_CALENDAR_ID", c2cciutils.gopass("gs/ci/google_calendar/calendarId")
-        )
-        self.token = os.environ.get("GOOGLE_TOKEN", c2cciutils.gopass("gs/ci/google_calendar/token"))
-        self.token_uri = os.environ.get(
-            "GOOGLE_TOKEN_URI", c2cciutils.gopass("gs/ci/google_calendar/token_uri")
-        )
-        self.refresh_token = os.environ.get(
-            "GOOGLE_REFRESH_TOKEN",
-            c2cciutils.gopass("gs/ci/google_calendar/refresh_token"),
-        )
-        self.client_id = os.environ.get(
-            "GOOGLE_CLIENT_ID", c2cciutils.gopass("gs/ci/google_calendar/client_id")
-        )
-        self.client_secret = os.environ.get(
-            "GOOGLE_CLIENT_SECRET",
-            c2cciutils.gopass("gs/ci/google_calendar/client_secret"),
-        )
-
-        self.creds: Credentials = self.init_calendar_service()
-        self._update_creds()
-        self.service = build("calendar", "v3", credentials=self.creds)
-
-    def init_calendar_service(self) -> Credentials:  # type: ignore
-        """
-        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
-        # 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:
-                creds.refresh(Request())  # type: ignore
-            else:
-                if self.token:
-                    creds = Credentials(  # type: ignore
-                        self.token,
-                        refresh_token=self.refresh_token,
-                        token_uri=self.token_uri,
-                        client_id=self.client_id,
-                        client_secret=self.client_secret,
-                        scopes=self.scopes,
-                    )
-                else:
-                    flow = InstalledAppFlow.from_client_secrets_file(self.credentials_json_file, self.scopes)
-                    creds = flow.run_local_server(port=0)
-                    self.refresh_token = creds
-
-            # Save the credentials for the next run
-            with open(self.credentials_pickle_file, "wb") as token:
-                pickle.dump(creds, token)
-
-    def _update_creds(self) -> None:
-        """
-        Update the credentials.
-        """
-        self.client_id = self.creds.client_id
-        self.client_secret = self.creds.client_secret
-        self.token = self.creds.token
-        self.token_uri = self.creds.token_uri
-        self.refresh_token = self.creds.refresh_token
-
-    def print_all_calendars(self) -> None:
-        """
-        Print all calendar events.
-        """
-        # 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 = calendars_result.get("items", [])
-
-        if not calendars:
-            print("::error::No calendars found.")
-        for calendar in calendars:
-            summary = calendar["summary"]
-            event_id = calendar["id"]
-            primary = "Primary" if calendar.get("primary") else ""
-            print(f"{summary}\t{event_id}\t{primary}")
-
-    def print_latest_events(self, time_min: Optional[datetime.datetime] = None) -> None:
-        """
-        Print latest events.
-
-        Arguments:
-            time_min: The time to be considered.
-        """
-        now = datetime.datetime.utcnow()
-        if not time_min:
-            time_min = datetime.datetime.utcnow() - datetime.timedelta(days=30)
-        events_result = (
-            self.service.events()
-            .list(
-                calendarId=self.calendar_id,
-                timeMin=time_min.isoformat() + "Z",
-                timeMax=now.isoformat() + "Z",
-                singleEvents=True,
-                orderBy="startTime",
-            )
-            .execute()
-        )
-        events = events_result.get("items", [])
-
-        if not events:
-            print("::error::No upcoming events found.")
-        for event in events:
-            start = event["start"].get("dateTime", event["start"].get("date"))
-            print(start, event["summary"])
-
-    def create_event(
-        self,
-        summary: str = f"dummy/image:{datetime.datetime.now().isoformat()}",
-        description: str = "description",
-    ) -> None:
-        """
-        Create a calendar event.
-
-        Arguments:
-            summary: The event summary
-            description: The event description
-        """
-        now = datetime.datetime.now()
-        start = now.isoformat()
-        end = (now + datetime.timedelta(minutes=15)).isoformat()
-        body = {
-            "summary": summary,
-            "description": description,
-            "start": {"dateTime": start, "timeZone": "Europe/Zurich"},
-            "end": {"dateTime": end, "timeZone": "Europe/Zurich"},
-        }
-
-        event_result = self.service.events().insert(calendarId=self.calendar_id, body=body).execute()
-        print(f"Created event with id: {event_result['id']}")
-
-    def save_credentials_to_gopass(self) -> None:
-        """
-        Save the calendar credentials to gopass.
-        """
-        objects_to_save = {
-            "gs/ci/google_calendar/calendarId": self.calendar_id,
-            "gs/ci/google_calendar/token": self.token,
-            "gs/ci/google_calendar/token_uri": self.token_uri,
-            "gs/ci/google_calendar/refresh_token": self.refresh_token,
-            "gs/ci/google_calendar/client_id": self.client_id,
-            "gs/ci/google_calendar/client_secret": self.client_secret,
-        }
-        for key, secret in objects_to_save.items():
-            assert secret is not None
-            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)
-
-
-def main_calendar() -> None:
-    """
-    Run the calendar main function.
-    """
-    parser = argparse.ArgumentParser(
-        description="Interact with google API for the Docker publishing calendar"
-    )
-    parser.add_argument(
-        "--refresh-gopass-credentials",
-        action="store_true",
-        help="Refresh the credentials in gopass using google API",
-    )
-    parser.add_argument(
-        "--show-events-since",
-        help="show the calendar events since a date in 'YYYY-mm-dd' format",
-        type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
-    )
-    parser.add_argument(
-        "--create-test-event",
-        action="store_true",
-        help="Create a dummy event to check that the calendar settings are correct",
-    )
-    args = parser.parse_args()
-
-    if args.show_events_since or args.refresh_gopass_credentials or args.create_test_event:
-        google_calendar = GoogleCalendar()
-    else:
-        parser.print_help()
-
-    if 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()
-
-    if args.create_test_event:
-        google_calendar.create_event()
-
-
 def pip(
     package: c2cciutils.configuration.PublishPypiPackage, version: str, version_type: str, publish: bool
 ) -> bool:

{c2cciutils-1.7.4.dev128 → c2cciutils-1.7.5}/c2cciutils/scripts/publish.py

@@ -23,7 +23,6 @@ import c2cciutils.lib.docker
 import c2cciutils.lib.oidc
 import c2cciutils.publish
 import c2cciutils.scripts.download_applications
-from c2cciutils.publish import GoogleCalendar
 from c2cciutils.scripts.trigger_image_update import dispatch
 
 
@@ -185,13 +184,6 @@ def main() -> None:
                 else:
                     success &= c2cciutils.publish.pip(package, version, version_type, publish)
 
-    google_calendar = None
-    google_calendar_publish = config.get("publish", {}).get("google_calendar", False) is not False
-    google_calendar_config = cast(
-        c2cciutils.configuration.PublishGoogleCalendarConfig,
-        config.get("publish", {}).get("google_calendar", {}),
-    )
-
     docker_config = cast(
         c2cciutils.configuration.PublishDockerConfig,
         config.get("publish", {}).get("docker", {}) if config.get("publish", {}).get("docker", False) else {},
@@ -311,24 +303,6 @@ 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}",
-                                ]
-                            )
-
-                            google_calendar.create_event(summary, description)
-
         if args.dry_run:
             sys.exit(0)
 

{c2cciutils-1.7.4.dev128 → c2cciutils-1.7.5}/pyproject.toml

@@ -19,7 +19,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cciutils"
-version = "1.7.4.dev128"
+version = "1.7.5"
 description = "Common utilities for Camptocamp CI"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -51,7 +51,6 @@ c2cciutils-publish = "c2cciutils.scripts.publish:main"
 c2cciutils-version = "c2cciutils.scripts.version:main"
 c2cciutils-clean = "c2cciutils.scripts.clean:main"
 c2cciutils-checks = "c2cciutils.scripts.env:main"
-c2cciutils-google-calendar = "c2cciutils.publish:main_calendar"
 c2cciutils-k8s-install = "c2cciutils.scripts.k8s.install:main"
 c2cciutils-k8s-db = "c2cciutils.scripts.k8s.db:main"
 c2cciutils-k8s-wait = "c2cciutils.scripts.k8s.wait:main"
@@ -65,9 +64,6 @@ c2cciutils-docker-versions-gen = "c2cciutils.scripts.docker_versions_gen:main"
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
 requests = "2.32.5"
-google-api-python-client = { version = "2.148.0", optional = true }
-google-auth-httplib2 = { version = "0.2.0", optional = true }
-google-auth-oauthlib = { version = "1.2.2", optional = true }
 "ruamel.yaml" = "0.18.15"
 defusedxml = "0.7.1"
 twine = { version = "5.1.1", optional = true }