diff --git a/requirements.txt b/requirements.txt index 7312990..4287e4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,8 @@ openpyxl progress pyyaml beautifulsoup4 -fosslight_util>=2.1.0,<3.0.0 -fosslight_source>=2.1.0,<3.0.0 -fosslight_dependency>=4.1.0,<5.0.0 -fosslight_binary>=5.1.0,<6.0.0 +fosslight_util>=2.1.6,<3.0.0 +fosslight_source>=2.1.4,<3.0.0 +fosslight_dependency>=4.1.3,<5.0.0 +fosslight_binary>=5.1.2,<6.0.0 fosslight_prechecker>=4.0.0,<5.0.0 diff --git a/src/fosslight_scanner/fosslight_scanner.py b/src/fosslight_scanner/fosslight_scanner.py index 243e577..ae8e5dc 100755 --- a/src/fosslight_scanner/fosslight_scanner.py +++ b/src/fosslight_scanner/fosslight_scanner.py @@ -148,12 +148,15 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False, 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_all_{_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_all_{_start_time}" + elif formats[i].startswith('cyclonedx'): + output_files[i] = f'fosslight_cyclonedx_all_{_start_time}' else: if output_extension == _json_ext: output_files[i] = f"fosslight_opossum_all_{_start_time}"