fosslight-source 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

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_source/cli.py CHANGED
@@ -119,7 +119,7 @@ def main() -> None:
119
119
  except Exception as ex:
120
120
  logger.debug(f"Failed to print log.: {ex}")
121
121
  else:
122
- logger.error(f"Input path({path_to_scan}) is not a directory. Please enter a valid path.")
122
+ logger.error(f"(-p option) Input path({path_to_scan}) is not a directory. Please enter a valid path.")
123
123
  sys.exit(1)
124
124
 
125
125
 
@@ -204,7 +204,9 @@ def create_report_file(
204
204
  scan_item = ScannerItem(PKG_NAME, _start_time)
205
205
  scan_item.set_cover_pathinfo(path_to_scan, path_to_exclude)
206
206
  files_count, removed_files_count = count_files(path_to_scan, path_to_exclude)
207
- scan_item.set_cover_comment(f"Total number of files / removed files: {files_count} / {removed_files_count}")
207
+
208
+ scan_item.set_cover_comment(f"Total number of files : {files_count}")
209
+ scan_item.set_cover_comment(f"Removed files : {removed_files_count}")
208
210
 
209
211
  if not merged_result:
210
212
  if files_count < 1:
@@ -135,7 +135,7 @@ def run_scan(
135
135
  logger.error(f"Analyze {path_to_scan}: {msg}")
136
136
  else:
137
137
  success = False
138
- msg = "Check the path to scan. :" + path_to_scan
138
+ msg = f"(-p option) Check the path to scan: {path_to_scan}"
139
139
 
140
140
  if not return_results:
141
141
  result_list = []
@@ -64,6 +64,8 @@ def run_scanoss_py(path_to_scan: str, output_file_name: str = "", format: list =
64
64
  if not os.path.isdir(output_path):
65
65
  Path(output_path).mkdir(parents=True, exist_ok=True)
66
66
  output_json_file = os.path.join(output_path, SCANOSS_OUTPUT_FILE)
67
+ if os.path.exists(output_json_file): # remove scanner_output.wfp file if exist
68
+ os.remove(output_json_file)
67
69
 
68
70
  try:
69
71
  scanner = Scanner(
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: fosslight-source
3
- Version: 2.1.1
3
+ Version: 2.1.3
4
4
  Summary: FOSSLight Source Scanner
5
5
  Home-page: https://github.com/fosslight/fosslight_source_scanner
6
6
  Author: LG Electronics
@@ -16,14 +16,16 @@ Classifier: Programming Language :: Python :: 3.11
16
16
  Requires-Python: >=3.8
17
17
  Description-Content-Type: text/markdown
18
18
  Requires-Dist: pyparsing
19
- Requires-Dist: scancode-toolkit>=32.2.0
20
- Requires-Dist: scanoss
19
+ Requires-Dist: scanoss<=1.14.0
21
20
  Requires-Dist: XlsxWriter
22
- Requires-Dist: fosslight-util>=2.1.0
21
+ Requires-Dist: fosslight-util>=2.1.1
23
22
  Requires-Dist: PyYAML
24
23
  Requires-Dist: wheel>=0.38.1
25
24
  Requires-Dist: intbitset
26
25
  Requires-Dist: fosslight-binary>=5.0.0
26
+ Requires-Dist: psycopg2-binary==2.9.9
27
+ Requires-Dist: scancode-toolkit==32.2.*; sys_platform != "darwin"
28
+ Requires-Dist: scancode-toolkit==32.0.*; sys_platform == "darwin"
27
29
 
28
30
  <!--
29
31
  Copyright (c) 2021 LG Electronics
@@ -4,13 +4,13 @@ fosslight_source/_license_matched.py,sha256=-3H881XQjFDafRttBsuboS3VbCPYEvPH1pwW
4
4
  fosslight_source/_parsing_scancode_file_item.py,sha256=4U8wTuuNm-2-hanTxiQr2FvHTBrf2ZwESyea_E8caHU,13466
5
5
  fosslight_source/_parsing_scanoss_file.py,sha256=Ss6BWTdT1Q43xTT9GBwL6XyzHT2p57ymVm04NL76Vbg,4506
6
6
  fosslight_source/_scan_item.py,sha256=2RdnH5ZvrD7yjGxaHAIgSLmhq0dyW1379RScqPYJtOI,5679
7
- fosslight_source/cli.py,sha256=ekeAOx6C3-MQxKU3415ZHx8R1Q_aRttnWp9d9b4TRxE,15522
8
- fosslight_source/run_scancode.py,sha256=GRX1eSppx8d7OHm2VOv3wJBPzI6m5dY6DU8bgg8HCO4,7083
9
- fosslight_source/run_scanoss.py,sha256=jTX_yfSc5-OhrVuejpoA97Y6n80dNE1L5dXTe0utNgM,5234
7
+ fosslight_source/cli.py,sha256=phnXl1s_OYBK5ms2oslpEDxRWgZr9JcxyVWWx7ETPCg,15570
8
+ fosslight_source/run_scancode.py,sha256=leq-FuGwX-kBg-sNZXQ-DSKy-uTj7w2QBFeOLgyvPxc,7094
9
+ fosslight_source/run_scanoss.py,sha256=Z7iebJk9NJegoI2m2PT4hw3Qs294KhFwWxpcEnWn15U,5354
10
10
  fosslight_source/run_spdx_extractor.py,sha256=Hr9sTv06cJaVITy8amwexIW2FV8_rUcFw6hKmR9ZYws,1990
11
- fosslight_source-2.1.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
12
- fosslight_source-2.1.1.dist-info/METADATA,sha256=qT_Al-PEK32l3Vkm6kw2NL42Jk8zBCgT2VjUC6fapZo,3255
13
- fosslight_source-2.1.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
14
- fosslight_source-2.1.1.dist-info/entry_points.txt,sha256=NzFURHC4L8uf1PmnZ2uGQcZxR7UbYCgjetb_9aPHV-w,114
15
- fosslight_source-2.1.1.dist-info/top_level.txt,sha256=C2vw-0OIent84Vq-UEk1gt_kK1EL8dIItzBzp3WNyA4,17
16
- fosslight_source-2.1.1.dist-info/RECORD,,
11
+ fosslight_source-2.1.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
12
+ fosslight_source-2.1.3.dist-info/METADATA,sha256=_XW5uJe2ktXN8WNj39Qp2ZVMuZA7TSdH9aYOce8B_f8,3393
13
+ fosslight_source-2.1.3.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
14
+ fosslight_source-2.1.3.dist-info/entry_points.txt,sha256=NzFURHC4L8uf1PmnZ2uGQcZxR7UbYCgjetb_9aPHV-w,114
15
+ fosslight_source-2.1.3.dist-info/top_level.txt,sha256=C2vw-0OIent84Vq-UEk1gt_kK1EL8dIItzBzp3WNyA4,17
16
+ fosslight_source-2.1.3.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: bdist_wheel (0.44.0)
2
+ Generator: bdist_wheel (0.45.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5