Skip to content

Commit e2bc299

Browse files
committed
Remove prechecker
Signed-off-by: jiyeong.seok <[email protected]>
1 parent 51420c2 commit e2bc299

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ beautifulsoup4
77
fosslight_util>=2.0.0
88
fosslight_source>=2.0.0
99
fosslight_dependency>=4.0.0
10-
fosslight_binary>=5.0.0
11-
fosslight_prechecker==3.0.27
10+
fosslight_binary>=5.0.0

src/fosslight_scanner/fosslight_scanner.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
from fosslight_util.timer_thread import TimerThread
2525
import fosslight_util.constant as constant
2626
from fosslight_util.output_format import check_output_format
27-
from fosslight_prechecker._precheck import run_lint as prechecker_lint
2827
from fosslight_util.cover import CoverItem
2928
from fosslight_util.oss_item import ScannerItem
3029
from fosslight_util.output_format import write_output_file
@@ -51,7 +50,7 @@
5150
_executed_path = ""
5251
SRC_DIR_FROM_LINK_PREFIX = "fosslight_src_dir_"
5352
SCANNER_MODE = [
54-
"all", "compare", "reuse", "prechecker", "binary",
53+
"all", "compare", "binary",
5554
"bin", "src", "source", "dependency", "dep"
5655
]
5756

@@ -152,14 +151,7 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
152151
if success:
153152
output_files = {"SRC": f"fosslight_src_{_start_time}{output_extension}",
154153
"BIN": f"fosslight_bin_{_start_time}{output_extension}",
155-
"DEP": f"fosslight_dep_{_start_time}{output_extension}",
156-
"PRECHECKER": f"fosslight_lint_{_start_time}.yaml"}
157-
if run_prechecker:
158-
output_prechecker = os.path.join(_output_dir, output_files["PRECHECKER"])
159-
success, result = call_analysis_api(src_path, "Prechecker Lint",
160-
-1, prechecker_lint,
161-
abs_path, False, output_prechecker,
162-
exclude_path=path_to_exclude)
154+
"DEP": f"fosslight_dep_{_start_time}{output_extension}"}
163155

164156
if run_src:
165157
try:
@@ -397,27 +389,21 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
397389
run_src = False
398390
run_bin = False
399391
run_dep = False
400-
run_prechecker = False
401392
remove_downloaded_source = False
402393

403394
if "all" in mode_list or (not mode_list):
404395
run_src = True
405396
run_bin = True
406397
run_dep = True
407-
run_prechecker = False
408-
if "prechecker" in mode_list or "reuse" in mode_list:
409-
run_prechecker = True
410398
else:
411-
if "prechecker" in mode_list or "reuse" in mode_list:
412-
run_prechecker = True
413399
if "binary" in mode_list or "bin" in mode_list:
414400
run_bin = True
415401
if "source" in mode_list or "src" in mode_list:
416402
run_src = True
417403
if "dependency" in mode_list or "dep" in mode_list:
418404
run_dep = True
419405

420-
if run_dep or run_src or run_bin or run_prechecker:
406+
if run_dep or run_src or run_bin:
421407
if src_path == "" and url_to_analyze == "":
422408
src_path, dep_arguments, url_to_analyze = get_input_mode(_executed_path, mode_list)
423409

@@ -439,7 +425,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
439425

440426
if src_path != "":
441427
run_scanner(src_path, dep_arguments, output_path, keep_raw_data,
442-
run_src, run_bin, run_dep, run_prechecker,
428+
run_src, run_bin, run_dep, '',
443429
remove_downloaded_source, {}, output_file,
444430
output_extension, num_cores, db_url,
445431
default_oss_name, default_oss_version, url_to_analyze,

0 commit comments

Comments
 (0)