From 42f98682de36d5560ac0f0bfd0175f725d715ee3 Mon Sep 17 00:00:00 2001 From: memsharded Date: Wed, 3 Jul 2024 15:03:45 +0200 Subject: [PATCH] add indent and remove typing --- extensions/commands/sbom/cmd_cyclonedx.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/extensions/commands/sbom/cmd_cyclonedx.py b/extensions/commands/sbom/cmd_cyclonedx.py index 4a489d5f..a319b112 100644 --- a/extensions/commands/sbom/cmd_cyclonedx.py +++ b/extensions/commands/sbom/cmd_cyclonedx.py @@ -17,7 +17,7 @@ def format_cyclonedx(formatter_module: str, formatter_class: str, bom: 'Bom') -> None: module = import_module(formatter_module) klass = getattr(module, formatter_class) - serialized = klass(bom).output_as_string() + serialized = klass(bom).output_as_string(indent=2) cli_out_write(serialized) @@ -66,8 +66,6 @@ def cyclonedx(conan_api: ConanAPI, parser, *args) -> 'Bom': sep='\n', file=sys.stderr) sys.exit(1) - if TYPE_CHECKING: - from conans.client.graph.graph import Node def package_type_to_component_type(pt: str) -> ComponentType: return ComponentType.APPLICATION if pt == "application" else ComponentType.LIBRARY @@ -82,7 +80,7 @@ def licenses(ls: Optional[Union[Tuple[str, ...], Set[str], List[str], str]]) -> ls = [ls] return [LicenseFactory().make_from_string(i) for i in ls] - def package_url(node: 'Node') -> Optional[PackageURL]: + def package_url(node) -> Optional[PackageURL]: """ Creates a PURL following https://github.com/package-url/purl-spec/blob/master/PURL-TYPES.rst#conan """ @@ -99,7 +97,7 @@ def package_url(node: 'Node') -> Optional[PackageURL]: } ) if node.name else None - def create_component(node: 'Node') -> Component: + def create_component(node) -> Component: purl = package_url(node) component = Component( type=package_type_to_component_type(node.conanfile.package_type),