fosslight-source 2.3.7__tar.gz → 2.3.8__tar.gz

{fosslight_source-2.3.7/src/fosslight_source.egg-info → fosslight_source-2.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.3.7
+Version: 2.3.8
 Summary: FOSSLight Source Scanner
 Author: LG Electronics
 License-Expression: Apache-2.0
@@ -18,9 +18,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: setuptools<=80.10.2
 Requires-Dist: pyparsing
-Requires-Dist: scanoss>=1.19.0
+Requires-Dist: scanoss>=1.45.0
 Requires-Dist: XlsxWriter
-Requires-Dist: fosslight_util>=2.2.2
+Requires-Dist: fosslight_util>=2.2.7
 Requires-Dist: PyYAML
 Requires-Dist: wheel>=0.38.1
 Requires-Dist: intbitset

{fosslight_source-2.3.7 → fosslight_source-2.3.8}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fosslight_source"
-version = "2.3.7"
+version = "2.3.8"
 description = "FOSSLight Source Scanner"
 readme = "README.md"
 license = "Apache-2.0"
@@ -27,9 +27,9 @@ requires-python = ">=3.10,<3.15"
 dependencies = [
     "setuptools<=80.10.2",
     "pyparsing",
-    "scanoss>=1.19.0",
+    "scanoss>=1.45.0",
     "XlsxWriter",
-    "fosslight_util>=2.2.2",
+    "fosslight_util>=2.2.7",
     "PyYAML",
     "wheel>=0.38.1",
     "intbitset",

{fosslight_source-2.3.7 → fosslight_source-2.3.8}/src/fosslight_source/_license_matched.py

@@ -6,10 +6,8 @@ import logging
 import fosslight_util.constant as constant
 
 logger = logging.getLogger(constant.LOGGER_NAME)
-HEADER = ['No', 'Category', 'License',
-          'Matched Text', 'File Count', 'Files']
-HEADER_32_LATER = ['No', 'License', 'Matched Text',
-                   'File Count', 'Files']
+HEADER = ['No', 'License', 'Matched Text',
+          'File Count', 'Files']
 LOW_PRIORITY = ['Permissive', 'Public Domain']
 
 
@@ -46,18 +44,15 @@ class MatchedLicense:
     def set_matched_text(self, value: str) -> None:
         self.matched_text = value
 
-    def get_row_to_print(self, result_for_32_earlier: bool = True) -> list:
-        if result_for_32_earlier:
-            print_rows = [self.category, self.license, self.matched_text, str(len(self.files)), ','.join(self.files)]
-        else:
-            print_rows = [self.license, self.matched_text, str(len(self.files)), ','.join(self.files)]
-        return print_rows
+    def get_row_to_print(self) -> list:
+        return [self.license, self.matched_text, str(len(self.files)), ','.join(self.files)]
 
 
 def get_license_list_to_print(license_list: dict) -> list:
-    result_for_32_earlier = any([value.category for key, value in license_list.items()])
-    license_items = license_list.values()
-    license_items = sorted(license_items, key=lambda row: (row.priority, row.category, row.license))
-    license_rows = [lic_item.get_row_to_print(result_for_32_earlier) for lic_item in license_items]
-    license_rows.insert(0, HEADER if result_for_32_earlier else HEADER_32_LATER)
+    license_items = sorted(
+        license_list.values(),
+        key=lambda row: (row.priority, row.category, row.license),
+    )
+    license_rows = [lic_item.get_row_to_print() for lic_item in license_items]
+    license_rows.insert(0, HEADER)
     return license_rows