Skip to content

Commit 0921181

Browse files
committed
Update tox
Signed-off-by: jiyeong.seok <[email protected]>
1 parent 3e2e761 commit 0921181

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

src/fosslight_source/_scan_item.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ def set_oss_item(self):
8787
def get_print_array(self):
8888
print_rows = []
8989
for item in self.oss_items:
90-
print_rows.append([self.source_name_or_path, item.name, item.version, ",".join(item.license), item.download_location, "",
90+
print_rows.append([self.source_name_or_path, item.name, item.version, ",".join(item.license),
91+
item.download_location, "",
9192
item.copyright, "Exclude" if self.exclude else "", item.comment,
9293
self.license_reference])
9394
return print_rows

src/fosslight_source/cli.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def merge_results(scancode_result=[], scanoss_result=[], spdx_downloads={}):
250250
new_result_item = SourceItem(file_name)
251251
new_result_item.download_location = download_location
252252
scancode_result.append(new_result_item)
253-
253+
254254
for item in scancode_result:
255255
item.set_oss_item()
256256

@@ -307,8 +307,8 @@ def run_scanners(path_to_scan, output_file_name="", write_json_file=False, num_c
307307
spdx_downloads = get_spdx_downloads(path_to_scan, path_to_exclude)
308308
merged_result = merge_results(scancode_result, scanoss_result, spdx_downloads)
309309
scan_item = create_report_file(start_time, merged_result, license_list, scanoss_result, selected_scanner,
310-
print_matched_text, output_path, output_files, output_extensions, correct_mode,
311-
correct_filepath, path_to_scan, path_to_exclude)
310+
print_matched_text, output_path, output_files, output_extensions, correct_mode,
311+
correct_filepath, path_to_scan, path_to_exclude)
312312
else:
313313
print_help_msg_source_scanner()
314314
result_log[RESULT_KEY] = "Unsupported scanner"

src/fosslight_source/run_scancode.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from fosslight_util.set_log import init_log
1515
from ._parsing_scancode_file_item import parsing_file_item
1616
from ._parsing_scancode_file_item import get_error_from_header
17-
from ._license_matched import get_license_list_to_print
1817
from fosslight_util.output_format import check_output_formats
1918
from fosslight_binary.binary_analysis import check_binary
2019

tests/cli_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ def main():
3434
if len(ret) > 2:
3535
try:
3636
for scan_item in ret[2]:
37-
logger.warning(scan_item.get_row_to_print())
37+
logger.warning(scan_item.get_print_array())
3838
except Exception as ex:
3939
logger.error("Error:"+str(ex))
4040
if ret_scanoss:
4141
for scan_item in ret_scanoss:
42-
logger.warning(scan_item.get_row_to_print())
42+
logger.warning(scan_item.get_print_array())
4343

4444

4545
if __name__ == '__main__':

tox.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ commands =
4747

4848
python tests/cli_test.py
4949
pytest -v --flake8
50-
51-
pip install fosslight_scanner
52-
pip install fosslight_android
53-
fosslight -v
54-
fosslight_android -v
5550

5651
[testenv:flake8]
5752
deps = flake8

0 commit comments

Comments
 (0)