fosslight-util 2.1.3__tar.gz → 2.1.4__tar.gz

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_util
-Version: 2.1.3
+Version: 2.1.4
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/requirements.txt

@@ -15,4 +15,4 @@ numpy>=1.22.2; python_version >= '3.8'
 npm
 requests
 GitPython
-cyclonedx-python-lib==8.5.0
+cyclonedx-python-lib==8.5.*;sys_platform=="linux"

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_util',
-        version='2.1.3',
+        version='2.1.4',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Util',

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/src/fosslight_util/download.py

@@ -106,6 +106,7 @@ def cli_download_and_extract(link: str, target_dir: str, log_dir: str, checkout_
         datetime.now().strftime('%Y%m%d_%H-%M-%S')+".txt"
     logger, log_item = init_log(os.path.join(log_dir, log_file_name))
     link = link.strip()
+    is_rubygems = False
 
     try:
         if not link:

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/src/fosslight_util/output_format.py

@@ -183,14 +183,15 @@ def write_output_file(output_file_without_ext: str, file_extension: str, scan_it
             success, msg = write_opossum(result_file, scan_item)
         elif format == 'yaml':
             success, msg, _ = write_yaml(result_file, scan_item, False)
-        elif format.startswith('spdx'):
+        elif format.startswith('spdx') or format.startswith('cyclonedx'):
             if platform.system() == 'Windows' or platform.system() == 'Darwin':
                 success = False
                 msg = f'{platform.system()} not support spdx format.'
             else:
-                success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
-        elif format.startswith('cyclonedx'):
-            success, msg, _ = write_cyclonedx(output_file_without_ext, file_extension, scan_item)
+                if format.startswith('spdx'):
+                    success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
+                elif format.startswith('cyclonedx'):
+                    success, msg, _ = write_cyclonedx(output_file_without_ext, file_extension, scan_item)
     else:
         if file_extension == '.xlsx':
             success, msg = write_result_to_excel(result_file, scan_item, extended_header, hide_header)

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/src/fosslight_util/write_cyclonedx.py

@@ -17,22 +17,24 @@ from fosslight_util.constant import (LOGGER_NAME, FOSSLIGHT_DEPENDENCY, FOSSLIGH
 from fosslight_util.oss_item import CHECKSUM_NULL, get_checksum_sha1
 from packageurl import PackageURL
 import traceback
-from cyclonedx.builder.this import this_component as cdx_lib_component
-from cyclonedx.exception import MissingOptionalDependencyException
-from cyclonedx.factory.license import LicenseFactory
-from cyclonedx.model import XsUri, ExternalReferenceType
-from cyclonedx.model.bom import Bom
-from cyclonedx.model.component import Component, ComponentType, HashAlgorithm, HashType, ExternalReference
-from cyclonedx.model.contact import OrganizationalEntity
-from cyclonedx.output import make_outputter, BaseOutput
-from cyclonedx.output.json import JsonV1Dot6
-from cyclonedx.schema import OutputFormat, SchemaVersion
-from cyclonedx.validation import make_schemabased_validator
-from cyclonedx.validation.json import JsonStrictValidator
-from cyclonedx.output.json import Json as JsonOutputter
-from cyclonedx.output.xml import Xml as XmlOutputter
-from cyclonedx.validation.xml import XmlValidator
-
+try:
+    from cyclonedx.builder.this import this_component as cdx_lib_component
+    from cyclonedx.exception import MissingOptionalDependencyException
+    from cyclonedx.factory.license import LicenseFactory
+    from cyclonedx.model import XsUri, ExternalReferenceType
+    from cyclonedx.model.bom import Bom
+    from cyclonedx.model.component import Component, ComponentType, HashAlgorithm, HashType, ExternalReference
+    from cyclonedx.model.contact import OrganizationalEntity
+    from cyclonedx.output import make_outputter, BaseOutput
+    from cyclonedx.output.json import JsonV1Dot6
+    from cyclonedx.schema import OutputFormat, SchemaVersion
+    from cyclonedx.validation import make_schemabased_validator
+    from cyclonedx.validation.json import JsonStrictValidator
+    from cyclonedx.output.json import Json as JsonOutputter
+    from cyclonedx.output.xml import Xml as XmlOutputter
+    from cyclonedx.validation.xml import XmlValidator
+except Exception:
+    logger.info('No import cyclonedx-python-lib')
 logger = logging.getLogger(LOGGER_NAME)
 
 

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/src/fosslight_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-util
-Version: 2.1.3
+Version: 2.1.4
 Summary: FOSSLight Util
 Home-page: https://github.com/fosslight/fosslight_util
 Author: LG Electronics

{fosslight_util-2.1.3 → fosslight_util-2.1.4}/src/fosslight_util.egg-info/requires.txt

@@ -12,7 +12,6 @@ setuptools>=65.5.1
 npm
 requests
 GitPython
-cyclonedx-python-lib==8.5.0
 
 [:python_version < "3.8"]
 numpy
@@ -28,3 +27,4 @@ pygit2>=1.10.1
 
 [:sys_platform == "linux"]
 spdx-tools==0.8.*
+cyclonedx-python-lib==8.5.*