fosslight-source 2.1.3__tar.gz → 2.1.5__tar.gz

{fosslight_source-2.1.3 → fosslight_source-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_source
-Version: 2.1.3
+Version: 2.1.5
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Author: LG Electronics

{fosslight_source-2.1.3 → fosslight_source-2.1.5}/requirements.txt

@@ -1,7 +1,7 @@
 pyparsing
 scanoss<=1.14.0
 XlsxWriter
-fosslight_util>=2.1.1
+fosslight_util>=2.1.6
 PyYAML
 wheel>=0.38.1
 intbitset

{fosslight_source-2.1.3 → fosslight_source-2.1.5}/setup.py

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

{fosslight_source-2.1.3 → fosslight_source-2.1.5}/src/fosslight_source/cli.py

@@ -174,12 +174,15 @@ def create_report_file(
         for i, output_extension in enumerate(output_extensions):
             if output_files[i] is None or output_files[i] == "":
                 if formats:
-                    if formats[i].startswith('spdx'):
-                        if platform.system() != 'Windows':
-                            output_files[i] = f"fosslight_spdx_src_{_start_time}"
-                        else:
-                            logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
+                    if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
+                        if platform.system() == 'Windows':
+                            logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.')
                             to_remove.append(i)
+                        else:
+                            if formats[i].startswith('spdx'):
+                                output_files[i] = f"fosslight_spdx_src_{_start_time}"
+                            elif formats[i].startswith('cyclonedx'):
+                                output_files[i] = f'fosslight_cyclonedx_src_{_start_time}'
                     else:
                         if output_extension == _json_ext:
                             output_files[i] = f"fosslight_opossum_src_{_start_time}"

{fosslight_source-2.1.3 → fosslight_source-2.1.5}/src/fosslight_source.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-source
-Version: 2.1.3
+Version: 2.1.5
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Author: LG Electronics

{fosslight_source-2.1.3 → fosslight_source-2.1.5}/src/fosslight_source.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pyparsing
 scanoss<=1.14.0
 XlsxWriter
-fosslight_util>=2.1.1
+fosslight_util>=2.1.6
 PyYAML
 wheel>=0.38.1
 intbitset