style: ruff

Author: bclindner

src/mobster/cmd/generate/oci_image/__init__.py

@@ -20,7 +20,6 @@
 from mobster import syft
 from mobster.cmd.generate.base import GenerateCommandWithOutputTypeSelector
 from mobster.cmd.generate.oci_image.add_image import extend_sbom_with_image_reference
-from mobster.cmd.generate.oci_image.metadata import SBOMMetadata
 from mobster.cmd.generate.oci_image.contextual_sbom.builder import (
     BuilderContextualizationError,
     BuilderPkgMetadata,
@@ -40,14 +39,15 @@
 from mobster.cmd.generate.oci_image.hermeto_sbom_filter import (
     filter_hermeto_sbom_by_arch,
 )
+from mobster.cmd.generate.oci_image.metadata import SBOMMetadata
 from mobster.cmd.generate.oci_image.spdx_utils import (
     DocumentIndexOCI,
     extend_spdx_with_base_images,
     normalize_and_load_sbom,
 )
-from mobster.oci import get_digest_for_image_ref
 from mobster.image import Image
 from mobster.log import log_elapsed
+from mobster.oci import get_digest_for_image_ref
 from mobster.sbom.merge import merge_sboms
 from mobster.utils import load_sbom_from_json
 
@@ -316,9 +316,13 @@ async def execute(self) -> Any:
                 base_images_refs.append(base_image_data.pullspec)
                 base_images_map[base_image_data.pullspec] = base_image
             if isinstance(sbom, CycloneDX1BomWrapper):
-                await extend_cdx_with_base_images(sbom, base_images_refs, base_images_map)
+                await extend_cdx_with_base_images(
+                    sbom, base_images_refs, base_images_map
+                )
             elif isinstance(sbom, Document):
-                await extend_spdx_with_base_images(sbom, base_images_refs, base_images_map)
+                await extend_spdx_with_base_images(
+                    sbom, base_images_refs, base_images_map
+                )
             for extra_image_data in self._metadata.extra_images:
                 extra_image = Image.from_image_index_url_and_digest(
                     extra_image_data.pullspec,

src/mobster/cmd/generate/oci_image/base_image_utils.py

@@ -1,7 +1,6 @@
 """Format-agnostic utilities for base image handling in multi-stage builds."""
 
 import logging
-from typing import Any
 
 from mobster.cmd.generate.oci_image.constants import IS_BASE_IMAGE_ANNOTATION
 from mobster.image import Image

src/mobster/cmd/generate/oci_image/cyclonedx_utils.py

@@ -137,9 +137,7 @@ async def extend_cdx_with_base_images(
     Returns:
         None: Nothing is returned, changes are performed in-place.
     """
-    components = await get_cdx_components_from_base_images(
-        base_image_refs, base_images
-    )
+    components = await get_cdx_components_from_base_images(base_image_refs, base_images)
     sbom_wrapper.formulation.append(
         {"components": CycloneDX1BomWrapper.get_component_dicts(components)}
     )

src/mobster/cmd/generate/oci_image/metadata.py

@@ -1,4 +1,5 @@
 """Pydantic classes for parsing SBOM metadata files."""
+
 import pydantic
 
 

tests/cmd/generate/oci_image/test_base_images_dockerfile.py

@@ -34,8 +34,8 @@
     extend_spdx_with_base_images,
     get_spdx_packages_from_base_images,
 )
-from mobster.oci import get_objects_for_base_images
 from mobster.image import Image
+from mobster.oci import get_objects_for_base_images
 
 
 @pytest.mark.asyncio
@@ -837,5 +837,3 @@ async def test_extend_cdx_with_base_images(
     await extend_cdx_with_base_images(initial_sbom, base_image_refs, base_images)
     updated_sbom_dict = initial_sbom.to_dict()
     assert updated_sbom_dict == expected_sbom
-
-

tests/cmd/generate/oci_image/test_module_init.py

@@ -16,8 +16,8 @@
 from spdx_tools.spdx.model.package import Package
 
 from mobster.cmd.generate.oci_image import GenerateOciImageCommand
-from mobster.cmd.generate.oci_image.metadata import SBOMMetadata
 from mobster.cmd.generate.oci_image.cyclonedx_utils import CycloneDX1BomWrapper
+from mobster.cmd.generate.oci_image.metadata import SBOMMetadata
 from mobster.image import Image
 from tests.conftest import GenerateOciImageTestCase, assert_cdx_sbom, assert_spdx_sbom
 
@@ -280,14 +280,13 @@ async def test_GenerateOciImageCommand__handle_bom_inputs(
     mock_merge.return_value = mock_merged_data
 
     def mock_metadata() -> None:
-        command._metadata = SBOMMetadata(**{
-            "image": {
-                "pullspec": "foo",
-                "digest": "bar"
-            },
-            "base_images": [],
-            "extra_images": [],
-        })
+        command._metadata = SBOMMetadata(
+            **{
+                "image": {"pullspec": "foo", "digest": "bar"},
+                "base_images": [],
+                "extra_images": [],
+            }
+        )
 
     mock_load_metadata.side_effect = mock_metadata