Merge branch 'main' into logger_fix

Author: dd-jy

.bumpversion.cfg

@@ -2,7 +2,7 @@
 commit = True
 tag = False
 message = Bump version: {current_version} → {new_version}
-current_version = 2.1.3
+current_version = 2.1.4
 
 [bumpversion:file:setup.py]
 search = '{current_version}'

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v2.1.4 (04/12/2024)
+## Changes
+## 🐛 Hotfixes
+
+- Bug fix related to before assignment @soimkim (#203)
+
+## 🔧 Maintenance
+
+- Fix cyclonedx not supported @dd-jy (#204)
+
+---
+
 ## v2.1.3 (28/11/2024)
 ## Changes
 ## 🚀 Features
@@ -304,17 +316,3 @@
 
 - Fix to check exclude for correcting oss info @dd-jy (#121)
 - Fix to find the sbom-info.yaml file with pattern @dd-jy (#120)
-
----
-
-## v1.4.24 (19/05/2023)
-## Changes
-## 🚀 Features
-
-- Add the correction with sbom-info.yaml @dd-jy (#119)
-
-## 🐛 Hotfixes
-
-- Fix the support default output format @dd-jy (#118)
-- Modify condition to check output format @bjk7119 (#116)
-- Fix the write_spdx bug @dd-jy (#117)

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"

setup.py

@@ -14,7 +14,7 @@
 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',

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)