capycli 2.6.0__tar.gz → 2.6.0.dev1__tar.gz

{capycli-2.6.0 → capycli-2.6.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: capycli
-Version: 2.6.0
+Version: 2.6.0.dev1
 Summary: CaPyCli - Clearing Automation Python Command Line Interface for SW360
 Home-page: https://github.com/sw360/capycli
 License: MIT
@@ -27,7 +27,6 @@ Requires-Dist: colorama (>=0.4.3,<0.5.0)
 Requires-Dist: cyclonedx-python-lib (>=8.0.0,<9.0.0)
 Requires-Dist: dateparser (>=1.1.8,<2.0.0)
 Requires-Dist: importlib-resources (>=5.12.0,<6.0.0)
-Requires-Dist: jsonschema (>=4.23.0,<5.0.0)
 Requires-Dist: openpyxl (>=3.0.3,<4.0.0)
 Requires-Dist: packageurl-python (>=0.15.6,<0.16.0)
 Requires-Dist: pyjwt (>=1.7.1,<2.0.0)
@@ -134,7 +133,7 @@ Commands and Sub-Commands
         Prerequisites     checks whether all prerequisites for a successful
                           software clearing are fulfilled
         Show              show project details
-        Licenses          show licenses of all cleared components
+        Licenses          show licenses of all cleared compponents
         Create            create or update a project on SW360
         Update            update an exiting project, preserving linked releases
         GetLicenseInfo    get license info of all project components
@@ -185,12 +184,6 @@ Options:
   --forceerror FORCE_ERROR                          force an error exit code in case of visual errors
 ```
 
-**Note about `--forceexit` and `--forceerror`**:  
-These options are not available for all commands. At the moment
-
-* `--forceexit` applies only to the `project vulnerabilities` command.
-* `--forceerror` applies only to the `project prerequisites` and `project getlicenseinfo` commands.
-
 ## Use Cases
 
 Over the time we implemented more and more commands with more and more parameters.  

{capycli-2.6.0 → capycli-2.6.0.dev1}/Readme.md

@@ -90,7 +90,7 @@ Commands and Sub-Commands
         Prerequisites     checks whether all prerequisites for a successful
                           software clearing are fulfilled
         Show              show project details
-        Licenses          show licenses of all cleared components
+        Licenses          show licenses of all cleared compponents
         Create            create or update a project on SW360
         Update            update an exiting project, preserving linked releases
         GetLicenseInfo    get license info of all project components
@@ -141,12 +141,6 @@ Options:
   --forceerror FORCE_ERROR                          force an error exit code in case of visual errors
 ```
 
-**Note about `--forceexit` and `--forceerror`**:  
-These options are not available for all commands. At the moment
-
-* `--forceexit` applies only to the `project vulnerabilities` command.
-* `--forceerror` applies only to the `project prerequisites` and `project getlicenseinfo` commands.
-
 ## Use Cases
 
 Over the time we implemented more and more commands with more and more parameters.  

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/bom/bom_convert.py

@@ -18,16 +18,17 @@ from sortedcontainers import SortedSet
 import capycli.common.json_support
 import capycli.common.script_base
 from capycli import get_logger
-from capycli.bom.csv import CsvSupport
-from capycli.bom.html import HtmlConversionSupport
-from capycli.bom.legacy import LegacySupport
-from capycli.bom.legacy_cx import LegacyCx
-from capycli.bom.plaintext import PlainTextSupport
 from capycli.common.capycli_bom_support import CaPyCliBom
-from capycli.common.print import print_red, print_text, print_yellow
+from capycli.common.print import print_red, print_text
 from capycli.main.exceptions import CaPyCliException
 from capycli.main.result_codes import ResultCode
 
+from .csv import CsvSupport
+from .html import HtmlConversionSupport
+from .legacy import LegacySupport
+from .legacy_cx import LegacyCx
+from .plaintext import PlainTextSupport
+
 LOG = get_logger(__name__)
 
 
@@ -46,8 +47,6 @@ class BomFormat(str, Enum):
     LEGACY_CX = "legacy-cx"
     # HTML
     HTML = "html"
-    # CycloneDX XML
-    XML = "xml"
 
 
 class BomConvert(capycli.common.script_base.ScriptBase):
@@ -76,11 +75,6 @@ class BomConvert(capycli.common.script_base.ScriptBase):
                 cdx_components = sbom.components
                 project = sbom.metadata.component
                 print_text(f"  {len(cdx_components)} components read from file {inputfile}")
-            elif (inputformat == BomFormat.XML):
-                sbom = CaPyCliBom.read_sbom_xml(inputfile)
-                cdx_components = sbom.components
-                project = sbom.metadata.component
-                print_text(f"  {len(cdx_components)} components read from file {inputfile}")
             elif inputformat == BomFormat.LEGACY:
                 cdx_components = SortedSet(LegacySupport.legacy_to_cdx_components(inputfile))
                 print_text(f"  {len(cdx_components)} components read from file {inputfile}")
@@ -112,12 +106,6 @@ class BomConvert(capycli.common.script_base.ScriptBase):
                 else:
                     CaPyCliBom.write_simple_sbom(cdx_components, outputfile)
                     print_text(f"  {len(cdx_components)} components written to file {outputfile}")
-            elif outputformat == BomFormat.XML:
-                if sbom:
-                    CaPyCliBom.write_sbom_xml(sbom, outputfile)
-                    print_text(f"  {len(sbom.components)} components written to file {outputfile}")
-                else:
-                    print_yellow("  This command only works for CycloneDX SBOM input files!")
             elif outputformat == BomFormat.LEGACY:
                 LegacySupport.write_cdx_components_as_legacy(cdx_components, outputfile)
                 print_text(f"  {len(cdx_components)} components written to file {outputfile}")
@@ -151,15 +139,15 @@ class BomConvert(capycli.common.script_base.ScriptBase):
 
     def display_help(self) -> None:
         """Display (local) help."""
-        print("usage: CaPyCli bom convert [-h] [-i INPUTFILE] [-if {capycli,sbom,text,csv,legacy,legacy-cx,xml}]")
-        print("                           [-o OUTPUTFILE] [-of {capycli,text,csv,legacy,legacy-cx,html,xml}]")
+        print("usage: CaPyCli bom convert [-h] [-i INPUTFILE] [-if {capycli,text,csv,legacy,legacy-cx}]")
+        print("                           [-o OUTPUTFILE] [-of {capycli,text,csv,legacy,legacy-cx,html}]")
         print("")
         print("optional arguments:")
         print("    -h, --help            Show this help message and exit")
         print("    -i INPUTFILE          Input BOM filename (JSON)")
         print("    -o OUTPUTFILE         Output BOM filename")
-        print("    -if INPUTFORMAT       Input file format: capycli|sbom|text|csv|legacy|legacy-cx|xml")
-        print("    -of OUTPUTFORMAT      Output file format: capycli|text|csv|legacy|html|xml")
+        print("    -if INPUTFORMAT       Specify input file format: capycli|sbom|text|csv|legacy|legacy-cx")
+        print("    -of OUTPUTFORMAT      Specify output file format: capycli|text|csv|legacy|html")
 
     def run(self, args: Any) -> None:
         """Main method()"""

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/bom/create_components.py

@@ -299,6 +299,8 @@ class BomCreateComponents(capycli.common.script_base.ScriptBase):
                 print_yellow(
                     "    WARNING: SW360 source URL", release_data["sourceCodeDownloadurl"],
                     "differs from BOM URL", data["sourceCodeDownloadurl"])
+                if data["sourceCodeDownloadurl"].endswith(('zip', 'tgz', 'tar.gz', 'tar')):
+                    update_data["sourceCodeDownloadurl"] = data["sourceCodeDownloadurl"]
 
         if "binaryDownloadurl" in data and data["binaryDownloadurl"]:
             if not release_data.get("binaryDownloadurl", ""):
@@ -366,6 +368,10 @@ class BomCreateComponents(capycli.common.script_base.ScriptBase):
             filename = str(CycloneDxSupport.get_ext_ref_binary_file(cx_comp))
             filehash = str(CycloneDxSupport.get_binary_file_hash(cx_comp))
 
+        if filename is not None and filename.endswith('.git'):
+            print_red("    WARNING: resetting filename to prevent uploading .git file")
+            filename = None
+
         # Note that we retrieve the SHA1 has from the CycloneDX data.
         # But there is no guarantee that this *IS* really a SHA1 hash!
 
@@ -374,10 +380,6 @@ class BomCreateComponents(capycli.common.script_base.ScriptBase):
             if filename_parsed:
                 filename = os.path.basename(filename_parsed.path)
 
-        if filetype in ["SOURCE", "SOURCE_SELF"] and filename is not None and filename.endswith('.git'):
-            print_red("    WARNING: resetting filename to prevent uploading .git file")
-            filename = None
-
         if not filename:
             print_red("    Unable to identify filename from url!")
             return

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/bom/filter_bom.py

@@ -20,7 +20,7 @@ import capycli.common.json_support
 import capycli.common.script_base
 from capycli import get_logger
 from capycli.bom.legacy import LegacySupport
-from capycli.common.capycli_bom_support import CaPyCliBom, CycloneDxSupport, SbomCreator, SbomWriter
+from capycli.common.capycli_bom_support import CaPyCliBom, CycloneDxSupport, SbomWriter
 from capycli.common.print import print_red, print_text, print_yellow
 from capycli.main.result_codes import ResultCode
 
@@ -320,7 +320,6 @@ class FilterBom(capycli.common.script_base.ScriptBase):
 
         print_text("Writing new SBOM to " + args.outputfile)
         try:
-            SbomCreator.add_standard_bom_standard(sbom)
             SbomWriter.write_to_json(sbom, args.outputfile, True)
         except Exception as ex:
             print_red("Error writing updated SBOM file: " + repr(ex))

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/bom/findsources.py

@@ -524,7 +524,7 @@ class FindSources(capycli.common.script_base.ScriptBase):
                 if self.verbose:
                     print("    No Source code URL available - try to find with language:")
                 source_url = self.find_source_url_by_language(component)
-            if not source_url and (language.lower() == "golang" or language.lower() == "go"):
+            if not source_url and language.lower() == "golang":
                 if self.verbose:
                     print("    No Source code URL available - try to find on pkg.go.dev:")
                 source_url = self.find_golang_url(component)

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/bom/handle_bom.py

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------------
-# Copyright (c) 2019-24 Siemens
+# Copyright (c) 2019-23 Siemens
 # All Rights Reserved.
 # Author: thomas.graf@siemens.com
 #
@@ -10,7 +10,6 @@ import sys
 from typing import Any
 
 import capycli.bom.bom_convert
-import capycli.bom.bom_validate
 import capycli.bom.check_bom
 import capycli.bom.check_bom_item_status
 import capycli.bom.check_granularity
@@ -47,10 +46,9 @@ def run_bom_command(args: Any) -> None:
         print("    CreateComponents  create new components and releases on SW360 (use with care!)")
         print("    DownloadSources   download source files from the URL specified in the SBOM")
         print("    Granularity       check a bill of material for potential component granularity issues")
-        print("    Diff              compare two bills of material")
-        print("    Merge             merge two bills of material")
-        print("    Findsources       determine the source code for SBOM items")
-        print("    Validate          validate an SBOM")
+        print("    Diff              compare two bills of material.")
+        print("    Merge             merge two bills of material.")
+        print("    Findsources       determine the source code for SBOM items.")
         return
 
     subcommand = args.command[1].lower()
@@ -133,11 +131,5 @@ def run_bom_command(args: Any) -> None:
         app13.run(args)
         return
 
-    if subcommand == "validate":
-        """Validate an SBOM."""
-        app14 = capycli.bom.bom_validate.BomValidate()
-        app14.run(args)
-        return
-
     print_red("Unknown sub-command: ")
     sys.exit(ResultCode.RESULT_COMMAND_ERROR)

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/bom/merge_bom.py

@@ -11,9 +11,7 @@ import sys
 from typing import Any, Optional
 
 from cyclonedx.model.bom import Bom
-from cyclonedx.model.bom_ref import BomRef
 from cyclonedx.model.component import Component
-from cyclonedx.model.dependency import Dependency
 
 import capycli.common.script_base
 from capycli.common.capycli_bom_support import CaPyCliBom, SbomWriter
@@ -83,36 +81,12 @@ class MergeBom(capycli.common.script_base.ScriptBase):
 
         return None
 
-    def find_dependency(self, bom_ref: BomRef, bom: Bom) -> Optional[Component]:
-        """Find a certain dependency (component) by bom_ref in the given bom."""
-        component: Component
-        for component in bom.components:
-            if component.bom_ref == bom_ref:
-                return component
-
-        return None
-
     def merge_boms(self, bom_old: Bom, bom_new: Bom) -> Bom:
-        """Merges two SBOMs."""
-
-        # step 1: merge components
-        component_new: Component
         for component_new in bom_new.components:
             found = self.find_in_bom(bom_old, component_new)
             if not found:
                 bom_old.components.add(component_new)
 
-        # step 2: reconstruct dependencies
-        dep: Dependency
-        for dep in bom_new.dependencies:
-            cr = self.find_dependency(dep.ref, bom_new)
-            if not cr:
-                continue
-            for d in dep.dependencies:
-                cd = self.find_dependency(d.ref, bom_new)
-                if cd:
-                    bom_old.register_dependency(cr, [cd])
-
         return bom_old
 
     def run(self, args: Any) -> None:

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/common/capycli_bom_support.py

@@ -10,9 +10,8 @@ import json
 import os
 import pathlib
 from enum import Enum
-from typing import TYPE_CHECKING, Any, List, Optional, Union
+from typing import Any, List, Optional, Union
 
-from cyclonedx.exception import MissingOptionalDependencyException
 from cyclonedx.factory.license import LicenseFactory
 from cyclonedx.model import ExternalReference, ExternalReferenceType, HashAlgorithm, HashType, Property, XsUri
 from cyclonedx.model.bom import Bom
@@ -20,22 +19,12 @@ from cyclonedx.model.component import Component, ComponentType
 from cyclonedx.model.contact import OrganizationalEntity
 from cyclonedx.model.definition import Definitions, Standard
 from cyclonedx.model.tool import ToolRepository
-from cyclonedx.output import make_outputter
 from cyclonedx.output.json import JsonV1Dot6
-from cyclonedx.schema import OutputFormat, SchemaVersion
-from cyclonedx.validation.json import JsonStrictValidator
-
-if TYPE_CHECKING:
-    from cyclonedx.output.json import Json as JsonOutputter
-    from cyclonedx.output.xml import Xml as XmlOutputter
-
-from defusedxml import ElementTree as SafeElementTree  # type:ignore[import-untyped]
 from sortedcontainers import SortedSet
 
 import capycli.common.script_base
 from capycli import LOG
 from capycli.common import json_support
-from capycli.common.print import print_green, print_yellow
 from capycli.main.exceptions import CaPyCliException
 
 # -------------------------------------
@@ -200,10 +189,6 @@ class CycloneDxSupport():
                     and (ext_ref.comment == CaPyCliBom.SOURCE_URL_COMMENT):
                 return ext_ref.url
 
-            # new for CyCloneDX 1.6
-            if (ext_ref.type == ExternalReferenceType.SOURCE_DISTRIBUTION):
-                return ext_ref.url
-
         return ""
 
     @staticmethod
@@ -260,33 +245,6 @@ class SbomCreator():
     def __init__(self) -> None:
         pass
 
-    @staticmethod
-    def remove_all_tools(sbom: Bom) -> None:
-        """Remove all existing tool entries."""
-        if (not sbom) or (not sbom.metadata) or (not sbom.metadata.tools):
-            return
-
-        if not sbom.metadata.tools.components:
-            return
-
-        sbom.metadata.tools.components.clear()
-
-    @staticmethod
-    def has_capycli_tool(sbom: Bom) -> bool:
-        """Checks whether CaPyCLI is already set as tool."""
-        if (not sbom) or (not sbom.metadata) or (not sbom.metadata.tools):
-            return False
-
-        if not sbom.metadata.tools.components:
-            return False
-
-        comp: Component
-        for comp in sbom.metadata.tools.components:
-            if comp.name == "CaPyCLI":
-                return True
-
-        return False
-
     @staticmethod
     def get_capycli_tool(version: str = "") -> Component:
         """Get CaPyCLI as tool."""
@@ -428,12 +386,11 @@ class SbomWriter():
 
     @classmethod
     def write_to_json(cls, sbom: Bom, outputfile: str, pretty_print: bool = False) -> None:
-        """Write CaPyCLI/CycloneDX JSON."""
-        SbomCreator.remove_all_tools(sbom)
-        if not SbomCreator.has_capycli_tool(sbom):
+        SbomWriter._remove_tool_python_lib(sbom)
+        if len(sbom.metadata.tools) == 0:
             sbom.metadata.tools.components.add(SbomCreator.get_capycli_tool())
 
-        writer: 'JsonOutputter' = JsonV1Dot6(sbom)
+        writer = JsonV1Dot6(sbom)
         cls.remove_empty_properties_in_sbom(sbom)
 
         if pretty_print:
@@ -442,20 +399,6 @@ class SbomWriter():
         else:
             writer.output_to_file(filename=outputfile, allow_overwrite=True)
 
-    @classmethod
-    def write_to_xml(cls, sbom: Bom, outputfile: str, pretty_print: bool = False) -> None:
-        """Write CaPyCLI/CycloneDX XML."""
-        SbomCreator.remove_all_tools(sbom)
-        if not SbomCreator.has_capycli_tool(sbom):
-            sbom.metadata.tools.components.add(SbomCreator.get_capycli_tool())
-        cls.remove_empty_properties_in_sbom(sbom)
-
-        writer: 'XmlOutputter' = make_outputter(sbom, OutputFormat.XML, SchemaVersion.V1_6)
-        if pretty_print:
-            writer.output_to_file(outputfile, indent=2)
-        else:
-            writer.output_to_file(outputfile)
-
 
 class CaPyCliBom():
     """
@@ -477,23 +420,19 @@ class CaPyCliBom():
             except Exception as exp:
                 raise CaPyCliException("Error reading raw JSON file: " + str(exp))
 
+            # my_json_validator = JsonStrictValidator(SchemaVersion.V1_6)
+            # try:
+            #     validation_errors = my_json_validator.validate_str(json_string)
+            #     if validation_errors:
+            #         raise CaPyCliException("JSON validation error: " + repr(validation_errors))
+            #
+            #     print_green("JSON file successfully validated")
+            # except MissingOptionalDependencyException as error:
+            #     print_yellow('JSON-validation was skipped due to', error)
             bom = Bom.from_json(  # type: ignore[attr-defined]
                 json_data)
             return bom
 
-    @classmethod
-    def read_sbom_xml(cls, inputfile: str) -> Bom:
-        LOG.debug(f"Reading from file {inputfile}")
-        with open(inputfile) as fin:
-            try:
-                xml_data = fin.read()
-            except Exception as exp:
-                raise CaPyCliException("Error reading raw XML file: " + str(exp))
-
-            bom = Bom.from_xml(  # type: ignore[attr-defined]
-                SafeElementTree.fromstring(xml_data))
-            return bom
-
     @classmethod
     def write_sbom(cls, sbom: Bom, outputfile: str) -> None:
         LOG.debug(f"Writing to file {outputfile}")
@@ -505,22 +444,6 @@ class CaPyCliBom():
             raise CaPyCliException("Error writing CaPyCLI file: " + str(exp))
         LOG.debug("done")
 
-    @classmethod
-    def write_sbom_xml(cls, sbom: Bom, outputfile: str) -> None:
-        LOG.debug(f"Writing to file {outputfile}")
-        try:
-            # always add/update profile
-            SbomCreator.add_profile(sbom, "clearing")
-
-            # ensure that file does exist
-            if os.path.isfile(outputfile):
-                os.remove(outputfile)
-
-            SbomWriter.write_to_xml(sbom, outputfile, pretty_print=True)
-        except Exception as exp:
-            raise CaPyCliException("Error writing CaPyCLI file: " + str(exp))
-        LOG.debug("done")
-
     @classmethod
     def write_simple_sbom(cls, bom: SortedSet, outputfile: str) -> None:
         LOG.debug(f"Writing to file {outputfile}")
@@ -531,39 +454,3 @@ class CaPyCliBom():
         except Exception as exp:
             raise CaPyCliException("Error writing CaPyCLI file: " + str(exp))
         LOG.debug("done")
-
-    @classmethod
-    def _string_to_schema_version(cls, spec_version: str) -> SchemaVersion:
-        """Convert the given string to a CycloneDX spec version."""
-        if spec_version == "1.6":
-            return SchemaVersion.V1_6
-        if spec_version == "1.5":
-            return SchemaVersion.V1_5
-        if spec_version == "1.4":
-            return SchemaVersion.V1_4
-
-        print_yellow("Unknown CycloneDX spec version, defaulting to 1.6")
-        return SchemaVersion.V1_6
-
-    @classmethod
-    def validate_sbom(cls, inputfile: str, spec_version: str) -> bool:
-        """Validate the given SBOM file against the given CycloneDX spec. version."""
-        LOG.debug(f"Validating SBOM from file {inputfile}")
-        with open(inputfile) as fin:
-            try:
-                json_string = fin.read()
-            except Exception as exp:
-                raise CaPyCliException("Error reading raw JSON file: " + str(exp))
-
-            my_json_validator = JsonStrictValidator(cls._string_to_schema_version(spec_version))
-            try:
-                validation_errors = my_json_validator.validate_str(json_string)
-                if validation_errors:
-                    raise CaPyCliException("JSON validation error: " + repr(validation_errors))
-
-                print_green("JSON file successfully validated.")
-                return True
-            except MissingOptionalDependencyException as error:
-                print_yellow('JSON-validation was skipped due to', error)
-
-            return False

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/dependencies/python.py

@@ -310,7 +310,7 @@ class GetPythonDependencies(capycli.common.script_base.ScriptBase):
 
         print()
 
-    def determine_file_type(self, full_filename: str) -> InputFileType:
+    def determine_file_type(self, filename: str) -> InputFileType:
         """
         Try to guess the input file type from the filename.
 
@@ -320,14 +320,13 @@ class GetPythonDependencies(capycli.common.script_base.ScriptBase):
         Returns:
             An InputFileType value.
         """
-        filename = os.path.basename(full_filename).lower()
+        filename = os.path.basename(filename).lower()
         if filename == "requirements.txt":
             LOG.debug("Guessing requirements file")
             return InputFileType.REQUIREMENTS
 
-        if (filename == "poetry.lock") or (filename == "poetry2.lock"):
-            # "poetry2.lock is only for unit test
-            data = self.read_poetry_lock_file(full_filename)
+        if filename == "poetry.lock":
+            data = self.read_poetry_lock_file(filename)
             if data:
                 LOG.debug("Guessing poetry.lock file")
                 return InputFileType.POETRY_LOCK

{capycli-2.6.0 → capycli-2.6.0.dev1}/capycli/main/options.py

@@ -46,10 +46,9 @@ class CommandlineSupport():
         CreateComponents  create new components and releases on SW360 (use with care!)
         DownloadSources   download source files from the URL specified in the SBOM
         Granularity       check a bill of material for potential component granularity issues
-        Diff              compare two bills of material
-        Merge             merge two bills of material
-        Findsources       determine the source code for SBOM items
-        Validate          validate an SBOM
+        Diff              compare two bills of material.
+        Merge             merge two bills of material.
+        Findsources       determine the source code for SBOM items.
 
     mapping
         ToHtml            create a HTML page showing the mapping result
@@ -64,7 +63,7 @@ class CommandlineSupport():
         Prerequisites     checks whether all prerequisites for a successful
                           software clearing are fulfilled
         Show              show project details
-        Licenses          show licenses of all cleared components
+        Licenses          show licenses of all cleared compponents
         Create            create or update a project on SW360
         Update            update an exiting project, preserving linked releases
         GetLicenseInfo    get license info of all project components
@@ -107,7 +106,6 @@ class CommandlineSupport():
         input_formats.append(BomFormat.LEGACY_CX)
         input_formats.append(BomFormat.SBOM)
         input_formats.append(BomFormat.CAPYCLI)
-        input_formats.append(BomFormat.XML)
 
         output_formats = []
         output_formats.append(BomFormat.CAPYCLI)
@@ -116,7 +114,6 @@ class CommandlineSupport():
         output_formats.append(BomFormat.CSV)
         output_formats.append(BomFormat.LEGACY)
         output_formats.append(BomFormat.HTML)
-        output_formats.append(BomFormat.XML)
 
         map_modes = []
         map_modes.append(MapMode.ALL)

{capycli-2.6.0 → capycli-2.6.0.dev1}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [tool.poetry]
 name = "capycli"
-version = "2.6.0"
+version = "2.6.0.dev1"
 description = "CaPyCli - Clearing Automation Python Command Line Interface for SW360"
 authors = ["Thomas Graf <thomas.graf@siemens.com>"]
 license = "MIT"
@@ -52,7 +52,6 @@ dateparser = "^1.1.8"
 urllib3 = "*"
 importlib-resources = "^5.12.0"
 beautifulsoup4 = "^4.11.1"
-jsonschema = "^4.23.0"
 
 [tool.poetry.group.dev.dependencies]
 flake8 = ">=3.7.8"

capycli-2.6.0/capycli/bom/bom_validate.py

@@ -1,68 +0,0 @@
-# -------------------------------------------------------------------------------
-# Copyright (c) 2024 Siemens
-# All Rights Reserved.
-# Author: thomas.graf@siemens.com
-#
-# SPDX-License-Identifier: MIT
-# -------------------------------------------------------------------------------
-
-import os
-import sys
-from typing import Any
-
-import capycli.common.json_support
-import capycli.common.script_base
-from capycli import get_logger
-from capycli.common.capycli_bom_support import CaPyCliBom
-from capycli.common.print import print_text
-from capycli.main.exceptions import CaPyCliException
-from capycli.main.result_codes import ResultCode
-
-LOG = get_logger(__name__)
-
-
-class BomValidate(capycli.common.script_base.ScriptBase):
-    def validate(self, inputfile: str, spec_version: str) -> None:
-        """Main validation method."""
-        try:
-            if not spec_version:
-                print_text("No CycloneDX spec version specified, defaulting to 1.6")
-                spec_version = "1.6"
-            CaPyCliBom.validate_sbom(inputfile, spec_version)
-        except CaPyCliException as error:
-            LOG.error(f"Error processing input file: {str(error)}")
-            sys.exit(ResultCode.RESULT_GENERAL_ERROR)
-
-    def check_arguments(self, args: Any) -> None:
-        """Check input arguments."""
-        if not args.inputfile:
-            LOG.error("No input file specified!")
-            sys.exit(ResultCode.RESULT_COMMAND_ERROR)
-
-        if not os.path.isfile(args.inputfile):
-            LOG.error("Input file not found!")
-            sys.exit(ResultCode.RESULT_FILE_NOT_FOUND)
-
-    def display_help(self) -> None:
-        """Display (local) help."""
-        print("usage: CaPyCli bom validate [-h] -i INPUTFILE [-version SpecVersion]")
-        print("")
-        print("optional arguments:")
-        print("    -h, --help            Show this help message and exit")
-        print("    -i INPUTFILE          Input BOM filename (JSON)")
-        print("    -version SpecVersion  CycloneDX spec version to validate against: allowed are 1.4, 1.5, and 1.6")
-
-    def run(self, args: Any) -> None:
-        """Main method()"""
-        print("\n" + capycli.APP_NAME + ", " + capycli.get_app_version() + " - Validate a CaPyCLI/CycloneDX SBOM\n")
-
-        if args.help:
-            self.display_help()
-            return
-
-        self.check_arguments(args)
-        if args.debug:
-            global LOG
-            LOG = get_logger(__name__)
-
-        self.validate(args.inputfile, args.version)