fosslight-scanner 2.1.8__tar.gz → 2.1.9__tar.gz

{fosslight_scanner-2.1.8 → fosslight_scanner-2.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_scanner
-Version: 2.1.8
+Version: 2.1.9
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Download-URL: https://github.com/fosslight/fosslight_scanner

{fosslight_scanner-2.1.8 → fosslight_scanner-2.1.9}/requirements.txt

@@ -5,7 +5,7 @@ progress
 pyyaml
 beautifulsoup4
 fosslight_util>=2.1.12,<3.0.0
-fosslight_source>=2.1.4,<3.0.0
+fosslight_source>=2.1.12,<3.0.0
 fosslight_dependency>=4.1.3,<5.0.0
-fosslight_binary>=5.1.2,<6.0.0
+fosslight_binary>=5.1.9,<6.0.0
 fosslight_prechecker>=4.0.0,<5.0.0

{fosslight_scanner-2.1.8 → fosslight_scanner-2.1.9}/setup.py

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

{fosslight_scanner-2.1.8 → fosslight_scanner-2.1.9}/src/fosslight_scanner/common.py

@@ -168,10 +168,12 @@ def correct_scanner_result(all_scan_item):
         try:
             remove_src_idx_list = []
             for idx_src, src_fileitem in enumerate(src_fileitems):
-                src_fileitem.exclude = check_exclude_dir(src_fileitem.source_name_or_path, src_fileitem.exclude)
+                if check_package_dir(src_fileitem.source_name_or_path):
+                    continue
                 dup_flag = False
                 for bin_fileitem in bin_fileitems:
-                    bin_fileitem.exclude = check_exclude_dir(bin_fileitem.source_name_or_path, bin_fileitem.exclude)
+                    if check_package_dir(bin_fileitem.source_name_or_path):
+                        continue
                     if src_fileitem.source_name_or_path == bin_fileitem.source_name_or_path:
                         dup_flag = True
                         src_all_licenses_non_empty = all(oss_item.license for oss_item in src_fileitem.oss_items)
@@ -202,14 +204,12 @@ def correct_scanner_result(all_scan_item):
     return all_scan_item
 
 
-def check_exclude_dir(source_name_or_path, file_item_exclude):
-    if file_item_exclude:
-        return True
-    _exclude_dirs = ["venv", "node_modules", "Pods", "Carthage"]
-    exclude = False
+def check_package_dir(source_name_or_path):
+    _package_dirs = ["venv", "node_modules", "Pods", "Carthage"]
+    is_pkg = False
 
-    for exclude_dir in _exclude_dirs:
-        if exclude_dir in source_name_or_path.split(os.path.sep):
-            exclude = True
+    for package_dir in _package_dirs:
+        if package_dir in source_name_or_path.split(os.path.sep):
+            is_pkg = True
             break
-    return exclude
+    return is_pkg

{fosslight_scanner-2.1.8 → fosslight_scanner-2.1.9}/src/fosslight_scanner/fosslight_scanner.py

@@ -25,7 +25,6 @@ from fosslight_util.set_log import init_log
 from fosslight_util.timer_thread import TimerThread
 import fosslight_util.constant as constant
 from fosslight_util.output_format import check_output_formats_v2
-from fosslight_prechecker._precheck import run_lint as prechecker_lint
 from fosslight_util.cover import CoverItem
 from fosslight_util.oss_item import ScannerItem
 from fosslight_util.output_format import write_output_file

{fosslight_scanner-2.1.8 → fosslight_scanner-2.1.9}/src/fosslight_scanner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-scanner
-Version: 2.1.8
+Version: 2.1.9
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Download-URL: https://github.com/fosslight/fosslight_scanner

{fosslight_scanner-2.1.8 → fosslight_scanner-2.1.9}/src/fosslight_scanner.egg-info/requires.txt

@@ -5,7 +5,7 @@ progress
 pyyaml
 beautifulsoup4
 fosslight_util<3.0.0,>=2.1.12
-fosslight_source<3.0.0,>=2.1.4
+fosslight_source<3.0.0,>=2.1.12
 fosslight_dependency<5.0.0,>=4.1.3
-fosslight_binary<6.0.0,>=5.1.2
+fosslight_binary<6.0.0,>=5.1.9
 fosslight_prechecker<5.0.0,>=4.0.0