Skip to content

Commit b8bcdb4

Browse files
authored
Support cycloneDX format (#235)
Signed-off-by: jiyeong.seok <[email protected]>
1 parent e68afb6 commit b8bcdb4

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ lxml
44
virtualenv
55
pyyaml
66
lastversion
7-
fosslight_util>=2.1.0
7+
fosslight_util>=2.1.6
88
PyGithub
99
requirements-parser
1010
defusedxml

src/fosslight_dependency/run_dependency_scanner.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,15 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
128128
to_remove = [] # elements of spdx format on windows that should be removed
129129
for i, output_extension in enumerate(output_extensions):
130130
if formats:
131-
if formats[i].startswith('spdx'):
132-
if platform.system() != 'Windows':
133-
output_files[i] = f"fosslight_spdx_dep_{_start_time}"
134-
else:
135-
logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
131+
if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
132+
if platform.system() == 'Windows':
133+
logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.')
136134
to_remove.append(i)
135+
else:
136+
if formats[i].stasrtswith('spdx'):
137+
output_files[i] = f"fosslight_spdx_dep_{_start_time}"
138+
elif formats[i].startswith('cyclonedx'):
139+
output_files[i] = f'fosslight_cyclonedx_dep_{_start_time}'
137140
else:
138141
if output_extension == _json_ext:
139142
output_files[i] = f"fosslight_opossum_dep_{_start_time}"

0 commit comments

Comments
 (0)