fosslight-source 2.1.1__tar.gz → 2.1.3__tar.gz

{fosslight_source-2.1.1 → fosslight_source-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_source
-Version: 2.1.1
+Version: 2.1.3
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Author: LG Electronics

fosslight_source-2.1.3/requirements.txt

@@ -0,0 +1,11 @@
+pyparsing
+scanoss<=1.14.0
+XlsxWriter
+fosslight_util>=2.1.1
+PyYAML
+wheel>=0.38.1
+intbitset
+fosslight_binary>=5.0.0
+scancode-toolkit==32.0.*;sys_platform=="darwin"
+scancode-toolkit==32.2.*;sys_platform!="darwin"
+psycopg2-binary==2.9.9

{fosslight_source-2.1.1 → fosslight_source-2.1.3}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_source',
-        version='2.1.1',
+        version='2.1.3',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Source Scanner',

{fosslight_source-2.1.1 → fosslight_source-2.1.3}/src/fosslight_source/cli.py

@@ -119,7 +119,7 @@ def main() -> None:
         except Exception as ex:
             logger.debug(f"Failed to print log.: {ex}")
     else:
-        logger.error(f"Input path({path_to_scan}) is not a directory. Please enter a valid path.")
+        logger.error(f"(-p option) Input path({path_to_scan}) is not a directory. Please enter a valid path.")
         sys.exit(1)
 
 
@@ -204,7 +204,9 @@ def create_report_file(
     scan_item = ScannerItem(PKG_NAME, _start_time)
     scan_item.set_cover_pathinfo(path_to_scan, path_to_exclude)
     files_count, removed_files_count = count_files(path_to_scan, path_to_exclude)
-    scan_item.set_cover_comment(f"Total number of files / removed files: {files_count} / {removed_files_count}")
+
+    scan_item.set_cover_comment(f"Total number of files : {files_count}")
+    scan_item.set_cover_comment(f"Removed files : {removed_files_count}")
 
     if not merged_result:
         if files_count < 1:

{fosslight_source-2.1.1 → fosslight_source-2.1.3}/src/fosslight_source/run_scancode.py

@@ -135,7 +135,7 @@ def run_scan(
                 logger.error(f"Analyze {path_to_scan}: {msg}")
         else:
             success = False
-            msg = "Check the path to scan. :" + path_to_scan
+            msg = f"(-p option) Check the path to scan: {path_to_scan}"
 
         if not return_results:
             result_list = []

{fosslight_source-2.1.1 → fosslight_source-2.1.3}/src/fosslight_source/run_scanoss.py

@@ -64,6 +64,8 @@ def run_scanoss_py(path_to_scan: str, output_file_name: str = "", format: list =
         if not os.path.isdir(output_path):
             Path(output_path).mkdir(parents=True, exist_ok=True)
     output_json_file = os.path.join(output_path, SCANOSS_OUTPUT_FILE)
+    if os.path.exists(output_json_file):  # remove scanner_output.wfp file if exist
+        os.remove(output_json_file)
 
     try:
         scanner = Scanner(

{fosslight_source-2.1.1 → fosslight_source-2.1.3}/src/fosslight_source.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-source
-Version: 2.1.1
+Version: 2.1.3
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Author: LG Electronics

fosslight_source-2.1.3/src/fosslight_source.egg-info/requires.txt

@@ -0,0 +1,15 @@
+pyparsing
+scanoss<=1.14.0
+XlsxWriter
+fosslight_util>=2.1.1
+PyYAML
+wheel>=0.38.1
+intbitset
+fosslight_binary>=5.0.0
+psycopg2-binary==2.9.9
+
+[:sys_platform != "darwin"]
+scancode-toolkit==32.2.*
+
+[:sys_platform == "darwin"]
+scancode-toolkit==32.0.*

fosslight_source-2.1.1/requirements.txt

@@ -1,9 +0,0 @@
-pyparsing
-scancode-toolkit>=32.2.0
-scanoss
-XlsxWriter
-fosslight_util>=2.1.0
-PyYAML
-wheel>=0.38.1
-intbitset
-fosslight_binary>=5.0.0

fosslight_source-2.1.1/src/fosslight_source.egg-info/requires.txt

@@ -1,9 +0,0 @@
-pyparsing
-scancode-toolkit>=32.2.0
-scanoss
-XlsxWriter
-fosslight_util>=2.1.0
-PyYAML
-wheel>=0.38.1
-intbitset
-fosslight_binary>=5.0.0