black-reformatted

vivus-ignis · vivus-ignis · commit 384ff63708ee · 2025-10-23T14:56:52.000+02:00
diff --git a/src/gardenlinux/github/__main__.py b/src/gardenlinux/github/__main__.py
@@ -3,7 +3,11 @@
 from gardenlinux.constants import GARDENLINUX_GITHUB_RELEASE_BUCKET_NAME
 from gardenlinux.logger import LoggerSetup
 
-from .release import create_github_release, upload_to_github_release_page, write_to_release_id_file
+from .release import (
+    create_github_release,
+    upload_to_github_release_page,
+    write_to_release_id_file,
+)
 from .release_notes import create_github_release_notes
 
 LOGGER = LoggerSetup.get_logger("gardenlinux.github", "INFO")
@@ -18,7 +22,7 @@ def main():
     create_parser.add_argument("--repo", default="gardenlinux")
     create_parser.add_argument("--tag", required=True)
     create_parser.add_argument("--commit", required=True)
-    create_parser.add_argument('--latest', action='store_true', default=False)
+    create_parser.add_argument("--latest", action="store_true", default=False)
     create_parser.add_argument("--dry-run", action="store_true", default=False)
 
     upload_parser = subparsers.add_parser("upload")
@@ -31,7 +35,9 @@ def main():
     args = parser.parse_args()
 
     if args.command == "create":
-        body = create_github_release_notes(args.tag, args.commit, GARDENLINUX_GITHUB_RELEASE_BUCKET_NAME)
+        body = create_github_release_notes(
+            args.tag, args.commit, GARDENLINUX_GITHUB_RELEASE_BUCKET_NAME
+        )
         if args.dry_run:
             print("Dry Run ...")
             print("This release would be created:")
diff --git a/src/gardenlinux/github/release/__init__.py b/src/gardenlinux/github/release/__init__.py
@@ -27,14 +27,14 @@ def create_github_release(owner, repo, tag, commitish, latest, body):
         "body": body,
         "draft": False,
         "prerelease": False,
-        "make_latest": "true" if latest else "false"
+        "make_latest": "true" if latest else "false",
     }
 
     response = requests.post(
         f"https://api.github.com/repos/{owner}/{repo}/releases",
         headers=headers,
         data=json.dumps(data),
-        timeout=REQUESTS_TIMEOUTS
+        timeout=REQUESTS_TIMEOUTS,
     )
 
     if response.status_code == 201:
@@ -84,7 +84,9 @@ def upload_to_github_release_page(
         LOGGER.error(f"Error reading file {file_to_upload}: {e}")
         return
 
-    response = requests.post(upload_url, headers=headers, data=file_contents, timeout=REQUESTS_TIMEOUTS)
+    response = requests.post(
+        upload_url, headers=headers, data=file_contents, timeout=REQUESTS_TIMEOUTS
+    )
     if response.status_code == 201:
         LOGGER.info("Upload successful")
     else:
diff --git a/src/gardenlinux/github/release_notes/__init__.py b/src/gardenlinux/github/release_notes/__init__.py
@@ -7,7 +7,9 @@
 )
 
 
-def create_github_release_notes(gardenlinux_version, commitish, releases_s3_bucket_name):
+def create_github_release_notes(
+    gardenlinux_version, commitish, releases_s3_bucket_name
+):
     package_list = get_package_list(gardenlinux_version)
 
     output = ""
@@ -20,7 +22,9 @@ def create_github_release_notes(gardenlinux_version, commitish, releases_s3_buck
         gardenlinux_version, package_list
     )
 
-    metadata_files = download_all_metadata_files(gardenlinux_version, commitish, releases_s3_bucket_name)
+    metadata_files = download_all_metadata_files(
+        gardenlinux_version, commitish, releases_s3_bucket_name
+    )
 
     output += release_notes_image_ids_section(metadata_files)
 
diff --git a/src/gardenlinux/github/release_notes/deployment_platform/__init__.py b/src/gardenlinux/github/release_notes/deployment_platform/__init__.py
@@ -1,7 +1,7 @@
 from gardenlinux.constants import GARDENLINUX_GITHUB_RELEASE_BUCKET_NAME
 
 
-class DeploymentPlatform():
+class DeploymentPlatform:
     artifacts_bucket_name = GARDENLINUX_GITHUB_RELEASE_BUCKET_NAME
 
     def short_name(self):
@@ -25,7 +25,9 @@ def image_extension(self):
         return "raw"
 
     def artifact_for_flavor(self, flavor, markdown_format=True):
-        base_url = f"https://{self.__class__.artifacts_bucket_name}.s3.amazonaws.com/objects"
+        base_url = (
+            f"https://{self.__class__.artifacts_bucket_name}.s3.amazonaws.com/objects"
+        )
         filename = f"{flavor}.{self.image_extension()}"
         download_url = f"{base_url}/{flavor}/{filename}"
         if markdown_format:
@@ -48,7 +50,9 @@ def region_details(self, image_metadata):
                             "image_id": image_id,
                             "image_name": image_name,
                         }:
-                            details += f"**{region_name}:** {image_id} ({image_name})<br>"
+                            details += (
+                                f"**{region_name}:** {image_id} ({image_name})<br>"
+                            )
                         case {"region": region_name, "image_id": image_id}:
                             details += f"**{region_name}:** {image_id}<br>"
             case {"details": details_dict}:
@@ -93,7 +97,9 @@ def summary_text(self, image_metadata):
             }:
                 gallery_count = len(gallery_images)
                 marketplace_count = len(marketplace_images)
-                return f"{gallery_count} gallery + {marketplace_count} marketplace images"
+                return (
+                    f"{gallery_count} gallery + {marketplace_count} marketplace images"
+                )
             case {"gallery_images": gallery_images}:
                 gallery_count = len(gallery_images)
                 return f"{gallery_count} gallery images"
diff --git a/tests/constants.py b/tests/constants.py
@@ -27,7 +27,9 @@
 TEST_GARDENLINUX_COMMIT_SHORT = TEST_GARDENLINUX_COMMIT[:8]
 TEST_GARDENLINUX_RELEASE_BUCKET_NAME = "test__gardenlinux__releases"
 
-RELEASE_NOTES_TEST_DATA_DIR = Path(os.path.dirname(__file__)) / ".." / "test-data" / "release_notes"
+RELEASE_NOTES_TEST_DATA_DIR = (
+    Path(os.path.dirname(__file__)) / ".." / "test-data" / "release_notes"
+)
 RELEASE_NOTES_S3_ARTIFACTS_DIR = RELEASE_NOTES_TEST_DATA_DIR / "s3_bucket_artifacts"
 
 RELEASE_ARTIFACTS_METADATA_FILES = [
@@ -83,5 +85,5 @@
     "openstack-gardener_prod_usi-amd64.s3_metadata.yaml",
     "openstack-gardener_prod_usi-arm64.s3_metadata.yaml",
     "vmware-gardener_prod-amd64.s3_metadata.yaml",
-    "vmware-gardener_prod-arm64.s3_metadata.yaml"
+    "vmware-gardener_prod-arm64.s3_metadata.yaml",
 ]
diff --git a/tests/features/test_cname.py b/tests/features/test_cname.py
@@ -44,5 +44,7 @@ def test_cname_commit_id_setter():
     cname = CName("container", arch="amd64", version="today", commit_hash="local")
 
     # Act / Assert
-    with pytest.raises(RuntimeError, match="Commit hash given differs from commit ID already set"):
+    with pytest.raises(
+        RuntimeError, match="Commit hash given differs from commit ID already set"
+    ):
         cname.commit_hash = "broken"
diff --git a/tests/features/test_metadata_main.py b/tests/features/test_metadata_main.py
@@ -38,12 +38,22 @@ def get_container_amd64_release_metadata(version, commit_hash):
 GARDENLINUX_COMMIT_ID_LONG="local"
 """.strip()
 
+
 def test_main_output(monkeypatch, capsys):
     """
     Test successful "output-release-metadata"
     """
     # Arrange
-    argv = ["prog", "--cname", "container-amd64", "--version", "today", "--commit", "local", "output-release-metadata"]
+    argv = [
+        "prog",
+        "--cname",
+        "container-amd64",
+        "--version",
+        "today",
+        "--commit",
+        "local",
+        "output-release-metadata",
+    ]
     monkeypatch.setattr(sys, "argv", argv)
 
     # Act
@@ -53,14 +63,26 @@ def test_main_output(monkeypatch, capsys):
     expected = get_container_amd64_release_metadata("today", "local")
     assert expected == capsys.readouterr().out.strip()
 
+
 def test_main_write(monkeypatch, capsys):
     """
     Test successful "write"
     """
     # Arrange
     with TemporaryDirectory() as tmpdir:
         os_release_file = Path(tmpdir, "os_release")
-        argv = ["prog", "--cname", "container-amd64", "--version", "today", "--commit", "local", "--release-file", str(os_release_file), "write"]
+        argv = [
+            "prog",
+            "--cname",
+            "container-amd64",
+            "--version",
+            "today",
+            "--commit",
+            "local",
+            "--release-file",
+            str(os_release_file),
+            "write",
+        ]
         monkeypatch.setattr(sys, "argv", argv)
 
         # Act
@@ -70,6 +92,7 @@ def test_main_write(monkeypatch, capsys):
         expected = get_container_amd64_release_metadata("today", "local")
         assert expected == os_release_file.open("r").read()
 
+
 def test_main_validation(monkeypatch):
     """
     Test validation between release metadata and arguments given
@@ -81,7 +104,18 @@ def test_main_validation(monkeypatch):
         with os_release_file.open("w") as fp:
             fp.write(get_container_amd64_release_metadata("today", "local"))
 
-        argv = ["prog", "--cname", "base-python-amd64", "--version", "today", "--commit", "local", "--release-file", str(os_release_file), "output-release-metadata"]
+        argv = [
+            "prog",
+            "--cname",
+            "base-python-amd64",
+            "--version",
+            "today",
+            "--commit",
+            "local",
+            "--release-file",
+            str(os_release_file),
+            "output-release-metadata",
+        ]
         monkeypatch.setattr(sys, "argv", argv)
 
         # Act / Assert
diff --git a/tests/github/conftest.py b/tests/github/conftest.py
@@ -44,8 +44,10 @@ def release_id_file():
 def release_s3_bucket():
     with mock_aws():
         s3 = boto3.resource("s3", region_name="eu-central-1")
-        s3.create_bucket(Bucket=TEST_GARDENLINUX_RELEASE_BUCKET_NAME,
-                         CreateBucketConfiguration={"LocationConstraint": "eu-central-1"})
+        s3.create_bucket(
+            Bucket=TEST_GARDENLINUX_RELEASE_BUCKET_NAME,
+            CreateBucketConfiguration={"LocationConstraint": "eu-central-1"},
+        )
         yield s3.Bucket(TEST_GARDENLINUX_RELEASE_BUCKET_NAME)
 
 
@@ -55,19 +57,20 @@ def blackhole_s3_bucket():
     any object can be found, but downloading a file always raises an exception.
     This is needed to test the retry mechanism as the object also counts
     how many times an exception was raised."""
-    class BlackHoleObject():
+
+    class BlackHoleObject:
         def __init__(self, bucket_name, key):
             self.bucket_name = bucket_name
             self.key = key
 
-    class BlackHoleObjects():
+    class BlackHoleObjects:
         def __init__(self, bucket_name):
             self.bucket_name = bucket_name
 
         def filter(self, Prefix):
             return [BlackHoleObject(self.bucket_name, Prefix)]
 
-    class BlackHoleS3Bucket():
+    class BlackHoleS3Bucket:
         def __init__(self, bucket_name):
             self.objects = BlackHoleObjects(bucket_name)
             self.download_attempts = 0
diff --git a/tests/github/test_create_github_release.py b/tests/github/test_create_github_release.py
@@ -19,9 +19,11 @@ def test_create_github_release_needs_github_token():
                 TEST_GARDENLINUX_RELEASE,
                 TEST_GARDENLINUX_COMMIT,
                 False,
-                "")
-            assert str(exn.value) == "GITHUB_TOKEN environment variable not set", \
-                "Expected an exception to be raised on missing GITHUB_TOKEN environment variable"
+                "",
+            )
+            assert (
+                str(exn.value) == "GITHUB_TOKEN environment variable not set"
+            ), "Expected an exception to be raised on missing GITHUB_TOKEN environment variable"
 
 
 def test_create_github_release_raise_on_failure(caplog, github_token):
@@ -30,33 +32,43 @@ def test_create_github_release_raise_on_failure(caplog, github_token):
             m.post(
                 "https://api.github.com/repos/gardenlinux/gardenlinux/releases",
                 text="{}",
-                status_code=503
+                status_code=503,
             )
             create_github_release(
                 "gardenlinux",
                 "gardenlinux",
                 TEST_GARDENLINUX_RELEASE,
                 TEST_GARDENLINUX_COMMIT,
                 False,
-                "")
-        assert any("Failed to create release" in record.message for record in caplog.records), "Expected a failure log record"
+                "",
+            )
+        assert any(
+            "Failed to create release" in record.message for record in caplog.records
+        ), "Expected a failure log record"
 
 
 def test_create_github_release(caplog, github_token):
     with requests_mock.Mocker() as m:
         m.post(
             "https://api.github.com/repos/gardenlinux/gardenlinux/releases",
             text='{"id": 101}',
-            status_code=201
+            status_code=201,
+        )
+        assert (
+            create_github_release(
+                "gardenlinux",
+                "gardenlinux",
+                TEST_GARDENLINUX_RELEASE,
+                TEST_GARDENLINUX_COMMIT,
+                False,
+                "",
+            )
+            == 101
         )
-        assert create_github_release(
-            "gardenlinux",
-            "gardenlinux",
-            TEST_GARDENLINUX_RELEASE,
-            TEST_GARDENLINUX_COMMIT,
-            False,
-            "") == 101
-        assert any("Release created successfully" in record.message for record in caplog.records), "Expected a success log record"
+        assert any(
+            "Release created successfully" in record.message
+            for record in caplog.records
+        ), "Expected a success log record"
 
 
 def test_write_to_release_id_file(release_id_file):
@@ -69,4 +81,6 @@ def test_write_to_release_id_file_broken_file_permissions(release_id_file, caplo
 
     with pytest.raises(SystemExit):
         write_to_release_id_file(TEST_GARDENLINUX_RELEASE)
-    assert any("Could not create" in record.message for record in caplog.records), "Expected a failure log record"
+    assert any(
+        "Could not create" in record.message for record in caplog.records
+    ), "Expected a failure log record"
diff --git a/tests/github/test_github_script.py b/tests/github/test_github_script.py
diff --git a/tests/github/test_upload_to_github_release_page.py b/tests/github/test_upload_to_github_release_page.py
