fosslight-scanner 2.1.3__tar.gz → 2.1.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/PKG-INFO +1 -1
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/setup.py +1 -1
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/common.py +3 -1
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/fosslight_scanner.py +2 -13
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/PKG-INFO +1 -1
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/LICENSE +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/MANIFEST.in +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/README.md +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/requirements.txt +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/setup.cfg +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/__init__.py +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/_get_input.py +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/_help.py +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/_parse_setting.py +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/_run_compare.py +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/cli.py +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/resources/bom_compare.html +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/SOURCES.txt +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/dependency_links.txt +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/entry_points.txt +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/requires.txt +0 -0
- {fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/top_level.txt +0 -0
|
@@ -15,7 +15,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
|
|
|
15
15
|
if __name__ == "__main__":
|
|
16
16
|
setup(
|
|
17
17
|
name='fosslight_scanner',
|
|
18
|
-
version='2.1.
|
|
18
|
+
version='2.1.4',
|
|
19
19
|
package_dir={"": "src"},
|
|
20
20
|
packages=find_packages(where='src'),
|
|
21
21
|
description='FOSSLight Scanner',
|
|
@@ -118,9 +118,11 @@ def create_scancodejson(all_scan_item_origin, ui_mode_report, src_path=""):
|
|
|
118
118
|
all_scan_item = copy.deepcopy(all_scan_item_origin)
|
|
119
119
|
if FOSSLIGHT_DEPENDENCY in all_scan_item.file_items:
|
|
120
120
|
del all_scan_item.file_items[FOSSLIGHT_DEPENDENCY]
|
|
121
|
-
first_sheet = FOSSLIGHT_SOURCE
|
|
122
121
|
if all_scan_item.file_items:
|
|
123
122
|
first_sheet = next(iter(all_scan_item.file_items))
|
|
123
|
+
else:
|
|
124
|
+
first_sheet = FOSSLIGHT_SOURCE
|
|
125
|
+
all_scan_item.file_items[first_sheet] = []
|
|
124
126
|
if src_path:
|
|
125
127
|
fileitems_without_oss = []
|
|
126
128
|
for root, _, files in os.walk(src_path):
|
{fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/fosslight_scanner.py
RENAMED
|
@@ -52,7 +52,7 @@ _start_time = ""
|
|
|
52
52
|
_executed_path = ""
|
|
53
53
|
SRC_DIR_FROM_LINK_PREFIX = "fosslight_src_dir_"
|
|
54
54
|
SCANNER_MODE = [
|
|
55
|
-
"all", "compare", "
|
|
55
|
+
"all", "compare", "binary",
|
|
56
56
|
"bin", "src", "source", "dependency", "dep"
|
|
57
57
|
]
|
|
58
58
|
|
|
@@ -183,12 +183,6 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
|
|
|
183
183
|
abs_path = os.path.abspath(src_path)
|
|
184
184
|
|
|
185
185
|
if success:
|
|
186
|
-
if run_prechecker:
|
|
187
|
-
success, result = call_analysis_api(src_path, "Prechecker Lint",
|
|
188
|
-
-1, prechecker_lint,
|
|
189
|
-
abs_path, False, _output_dir,
|
|
190
|
-
exclude_path=path_to_exclude)
|
|
191
|
-
|
|
192
186
|
if run_src:
|
|
193
187
|
try:
|
|
194
188
|
if fosslight_source_installed:
|
|
@@ -446,12 +440,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
|
|
|
446
440
|
run_src = True
|
|
447
441
|
run_bin = True
|
|
448
442
|
run_dep = True
|
|
449
|
-
run_prechecker = False
|
|
450
|
-
if "prechecker" in mode_list or "reuse" in mode_list:
|
|
451
|
-
run_prechecker = True
|
|
452
443
|
else:
|
|
453
|
-
if "prechecker" in mode_list or "reuse" in mode_list:
|
|
454
|
-
run_prechecker = True
|
|
455
444
|
if "binary" in mode_list or "bin" in mode_list:
|
|
456
445
|
run_bin = True
|
|
457
446
|
if "source" in mode_list or "src" in mode_list:
|
|
@@ -459,7 +448,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
|
|
|
459
448
|
if "dependency" in mode_list or "dep" in mode_list:
|
|
460
449
|
run_dep = True
|
|
461
450
|
|
|
462
|
-
if run_dep or run_src or run_bin
|
|
451
|
+
if run_dep or run_src or run_bin:
|
|
463
452
|
if src_path == "" and url_to_analyze == "":
|
|
464
453
|
src_path, dep_arguments, url_to_analyze = get_input_mode(_executed_path, mode_list)
|
|
465
454
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner/resources/bom_compare.html
RENAMED
|
File without changes
|
{fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
{fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/entry_points.txt
RENAMED
|
File without changes
|
{fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/requires.txt
RENAMED
|
File without changes
|
{fosslight_scanner-2.1.3 → fosslight_scanner-2.1.4}/src/fosslight_scanner.egg-info/top_level.txt
RENAMED
|
File without changes
|