fosslight-source 2.1.14__tar.gz → 2.1.16__tar.gz

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.1.14
+Version: 2.1.16
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner
@@ -14,6 +14,29 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10, <3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pyparsing
+Requires-Dist: scanoss>=1.18.0
+Requires-Dist: XlsxWriter
+Requires-Dist: fosslight_util>=2.1.30
+Requires-Dist: PyYAML
+Requires-Dist: wheel>=0.38.1
+Requires-Dist: intbitset
+Requires-Dist: fosslight_binary>=5.0.0
+Requires-Dist: scancode-toolkit>=32.0.2
+Requires-Dist: fingerprints==1.2.3
+Requires-Dist: normality==2.6.1
+Requires-Dist: click==8.2.1
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!--
 Copyright (c) 2021 LG Electronics

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/requirements.txt

@@ -1,7 +1,7 @@
 pyparsing
 scanoss>=1.18.0
 XlsxWriter
-fosslight_util>=2.1.10
+fosslight_util>=2.1.30
 PyYAML
 wheel>=0.38.1
 intbitset

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/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.14',
+        version='2.1.16',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Source Scanner',

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/src/fosslight_source/_parsing_scancode_file_item.py

@@ -7,6 +7,7 @@ import os
 import logging
 import re
 import fosslight_util.constant as constant
+from fosslight_util.get_pom_license import get_license_from_pom
 from ._license_matched import MatchedLicense
 from ._scan_item import SourceItem
 from ._scan_item import is_exclude_dir
@@ -192,8 +193,34 @@ def parsing_scancode_32_earlier(scancode_file_list: list, has_error: bool = Fals
                     if len(license_detected) > 0:
                         result_item.licenses = license_detected
 
-                        if is_manifest_file(file_path):
+                        detected_without_pom = []
+                        if is_manifest_file(file_path) and len(license_detected) > 0:
                             result_item.is_manifest_file = True
+                            if file_path.endswith('.pom'):
+                                try:
+                                    pom_licenses = get_license_from_pom(pom_path=file_path, check_parent=False)
+                                    normalize_pom_licenses = []
+                                    if pom_licenses:
+                                        pom_license_list = pom_licenses.split(', ')
+                                        for pom_license in pom_license_list:
+                                            if pom_license not in license_detected:
+                                                for lic_matched_key, lic_info in license_list.items():
+                                                    if hasattr(lic_info, 'matched_text') and lic_info.matched_text:
+                                                        matched_txt = str(lic_info.matched_text).replace(',', '')
+                                                        if pom_license in matched_txt:
+                                                            normalize_pom_licenses.append(lic_info.license)
+                                                            break
+                                            else:
+                                                normalize_pom_licenses.append(pom_license)
+                                    detected_without_pom = list(set(license_detected) - set(normalize_pom_licenses))
+                                    if detected_without_pom:
+                                        result_item.comment = f"Detected: {', '.join(detected_without_pom)}"
+                                        result_item.licenses = []
+                                        result_item.licenses = normalize_pom_licenses
+                                        if not normalize_pom_licenses:
+                                            result_item.exclude = True
+                                except Exception as ex:
+                                    logger.info(f"Failed to extract license from POM {file_path}: {ex}")
 
                         # Remove copyright info for license text file of GPL family
                         if should_remove_copyright_for_gpl_license_text(license_detected, result_item.is_license_text):
@@ -202,7 +229,7 @@ def parsing_scancode_32_earlier(scancode_file_list: list, has_error: bool = Fals
                         else:
                             result_item.copyright = copyright_value_list
 
-                        if len(license_expression_list) > 0:
+                        if len(license_expression_list) > 0 and not detected_without_pom:
                             license_expression_list = list(
                                 set(license_expression_list))
                             result_item.comment = ','.join(license_expression_list)
@@ -307,8 +334,34 @@ def parsing_scancode_32_later(
                 result_item.exclude = is_exclude_file(file_path)
                 result_item.is_license_text = file.get("percentage_of_license_text", 0) > 90 or is_notice_file(file_path)
 
+                detected_without_pom = []
                 if is_manifest_file(file_path) and len(license_detected) > 0:
                     result_item.is_manifest_file = True
+                    if file_path.endswith('.pom'):
+                        try:
+                            pom_licenses = get_license_from_pom(pom_path=file_path, check_parent=False)
+                            normalize_pom_licenses = []
+                            if pom_licenses:
+                                pom_license_list = pom_licenses.split(', ')
+                                for pom_license in pom_license_list:
+                                    if pom_license not in license_detected:
+                                        for lic_matched_key, lic_info in license_list.items():
+                                            if hasattr(lic_info, 'matched_text') and lic_info.matched_text:
+                                                matched_txt = str(lic_info.matched_text).replace(',', '')
+                                                if pom_license in matched_txt:
+                                                    normalize_pom_licenses.append(lic_info.license)
+                                                    break
+                                    else:
+                                        normalize_pom_licenses.append(pom_license)
+                            detected_without_pom = list(set(license_detected) - set(normalize_pom_licenses))
+                            if detected_without_pom:
+                                result_item.comment = f"Detected: {', '.join(detected_without_pom)}"
+                                result_item.licenses = []
+                                result_item.licenses = normalize_pom_licenses
+                                if not normalize_pom_licenses:
+                                    result_item.exclude = True
+                        except Exception as ex:
+                            logger.info(f"Failed to extract license from POM {file_path}: {ex}")
 
                 # Remove copyright info for license text file of GPL family
                 if should_remove_copyright_for_gpl_license_text(license_detected, result_item.is_license_text):
@@ -317,7 +370,7 @@ def parsing_scancode_32_later(
                 else:
                     result_item.copyright = copyright_value_list
 
-                if len(license_detected) > 1:
+                if len(license_detected) > 1 and not detected_without_pom:
                     license_expression_spdx = file.get("detected_license_expression_spdx", "")
                     license_expression = file.get("detected_license_expression", "")
                     if license_expression_spdx:

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/src/fosslight_source/_scan_item.py

@@ -74,6 +74,8 @@ class SourceItem(FileItem):
                             break
             if max_length_exceed and (SUBSTRING_LICENSE_COMMENT not in self.comment):
                 self.comment = f"{self.comment}/ {SUBSTRING_LICENSE_COMMENT}" if self.comment else SUBSTRING_LICENSE_COMMENT
+        else:
+            self._licenses = value
 
     def set_oss_item(self) -> None:
         self.oss_items = []
@@ -151,10 +153,13 @@ def is_manifest_file(file_path: str) -> bool:
 
 
 def is_package_dir(dir_path: str) -> bool:
-    path_parts = dir_path.split(os.path.sep)
+    # scancode and scanoss use '/' as path separator regardless of OS
+    dir_path = dir_path.replace('\\', '/')
+    path_parts = dir_path.split('/')
+
     for pkg_dir in _package_directory:
         if pkg_dir in path_parts:
             pkg_index = path_parts.index(pkg_dir)
-            pkg_path = os.path.sep.join(path_parts[:pkg_index + 1])
+            pkg_path = '/'.join(path_parts[:pkg_index + 1])
             return True, pkg_path
     return False, ""

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/src/fosslight_source.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: fosslight-source
-Version: 2.1.14
+Metadata-Version: 2.4
+Name: fosslight_source
+Version: 2.1.16
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner
@@ -14,6 +14,29 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10, <3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pyparsing
+Requires-Dist: scanoss>=1.18.0
+Requires-Dist: XlsxWriter
+Requires-Dist: fosslight_util>=2.1.30
+Requires-Dist: PyYAML
+Requires-Dist: wheel>=0.38.1
+Requires-Dist: intbitset
+Requires-Dist: fosslight_binary>=5.0.0
+Requires-Dist: scancode-toolkit>=32.0.2
+Requires-Dist: fingerprints==1.2.3
+Requires-Dist: normality==2.6.1
+Requires-Dist: click==8.2.1
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!--
 Copyright (c) 2021 LG Electronics

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/src/fosslight_source.egg-info/SOURCES.txt

@@ -18,4 +18,5 @@ src/fosslight_source.egg-info/SOURCES.txt
 src/fosslight_source.egg-info/dependency_links.txt
 src/fosslight_source.egg-info/entry_points.txt
 src/fosslight_source.egg-info/requires.txt
-src/fosslight_source.egg-info/top_level.txt
+src/fosslight_source.egg-info/top_level.txt
+tests/test_tox.py

{fosslight_source-2.1.14 → fosslight_source-2.1.16}/src/fosslight_source.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pyparsing
 scanoss>=1.18.0
 XlsxWriter
-fosslight_util>=2.1.10
+fosslight_util>=2.1.30
 PyYAML
 wheel>=0.38.1
 intbitset

fosslight_source-2.1.16/tests/test_tox.py

@@ -0,0 +1,161 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+import os
+import subprocess
+import pytest
+import shutil
+import sys
+
+# Add project root to sys.path for importing FL Source modules
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src'))
+
+# Import after sys.path modification to access our custom GPL license functions
+# flake8: noqa E402
+from fosslight_source._parsing_scancode_file_item import (
+    is_gpl_family_license, should_remove_copyright_for_gpl_license_text
+)
+
+remove_directories = ["test_scan", "test_scan2", "test_scan3"]
+
+
+@pytest.fixture(scope="module", autouse=True)
+def setup_test_result_dir():
+    print("==============setup==============")
+    for dir in remove_directories:
+        if os.path.exists(dir):
+            shutil.rmtree(dir)
+
+    yield
+
+
+def run_command(command):
+    process = subprocess.run(command, shell=True, capture_output=True, text=True)
+    success = (process.returncode == 0)
+    return success, process.stdout if success else process.stderr
+
+
+def test_is_gpl_family_license():
+    gpl_licenses = [
+        ["gpl-2.0"],
+        ["gpl-3.0"],
+        ["lgpl-2.1"],
+        ["lgpl-3.0"],
+        ["agpl-3.0"],
+        ["GPL-2.0"],
+        ["LGPL-2.1"],
+        ["AGPL-3.0"],
+        ["gpl-2.0-only"],
+        ["lgpl-2.1-only"],
+        ["agpl-3.0-only"],
+        ["gfdl-1.3"],
+        ["gpl-2.0", "mit"],
+        ["mit", "lgpl-3.0"]
+    ]
+
+    non_gpl_licenses = [
+        ["mit"],
+        ["apache-2.0"],
+        ["bsd-3-clause"],
+        ["mozilla-2.0"],
+        ["isc"],
+        [],
+        ["mit", "apache-2.0"]
+    ]
+
+    for licenses in gpl_licenses:
+        assert is_gpl_family_license(licenses), \
+            f"Should detect GPL family license: {licenses}"
+
+    for licenses in non_gpl_licenses:
+        assert not is_gpl_family_license(licenses), \
+            f"Should not detect GPL family license: {licenses}"
+
+
+def test_should_remove_copyright_for_gpl_license_text():
+    assert should_remove_copyright_for_gpl_license_text(["gpl-2.0"], True), \
+        "Should remove copyright for GPL license text file"
+    assert should_remove_copyright_for_gpl_license_text(["lgpl-3.0"], True), \
+        "Should remove copyright for LGPL license text file"
+    assert should_remove_copyright_for_gpl_license_text(["agpl-3.0"], True), \
+        "Should remove copyright for AGPL license text file"
+
+    assert not should_remove_copyright_for_gpl_license_text(["gpl-2.0"], False), \
+        "Should NOT remove copyright for GPL source file"
+    assert not should_remove_copyright_for_gpl_license_text(["lgpl-3.0"], False), \
+        "Should NOT remove copyright for LGPL source file"
+
+    assert not should_remove_copyright_for_gpl_license_text(["mit"], True), \
+        "Should NOT remove copyright for MIT license text file"
+    assert not should_remove_copyright_for_gpl_license_text(["apache-2.0"], True), \
+        "Should NOT remove copyright for Apache license text file"
+
+    assert not should_remove_copyright_for_gpl_license_text(["mit"], False), \
+        "Should NOT remove copyright for MIT source file"
+
+    assert not should_remove_copyright_for_gpl_license_text([], True), \
+        "Should NOT remove copyright for empty license list"
+    assert not should_remove_copyright_for_gpl_license_text([], False), \
+        "Should NOT remove copyright for empty license list"
+
+
+def test_run():
+    scan_success, _ = run_command("fosslight_source -p tests/test_files -j -m -o test_scan")
+    scan_exclude_success, _ = run_command("fosslight_source -p tests -e test_files/test cli_test.py -j -m -o test_scan2")
+    scan_files = os.listdir("test_scan")
+    scan2_files = os.listdir('test_scan2')
+
+    assert scan_success is True, "Test Run: Scan command failed"
+    assert scan_exclude_success is True, "Test Run: Exclude command failed"
+    assert len(scan_files) > 0, "Test Run: No scan files created in test_scan directory"
+    assert len(scan2_files) > 0, "Test Run: No scan files created in test_scan2 directory"
+
+
+def test_help_command():
+    success, msg = run_command("fosslight_source -h")
+    assert success is True, f"Test Release: Help command failed :{msg}"
+
+
+def test_scan_command():
+    success, _ = run_command("fosslight_source -p tests/test_files -o test_scan/scan_result.csv")
+    assert success is True, "Test Release: Failed to generate scan result CSV file"
+
+    assert os.path.exists("test_scan/scan_result.csv"), "Test Release: scan_result.csv file not generated"
+
+    with open("test_scan/scan_result.csv", 'r') as file:
+        content = file.read()
+
+    assert len(content) > 0, "Test Release: scan_result.csv is empty"
+    print(f"Content of scan_result.csv:\n{content}")
+
+
+def test_exclude_command():
+    success, _ = run_command(
+        "fosslight_source -p tests -e test_files/test cli_test.py -j -m -o test_scan2/scan_exclude_result.csv"
+    )
+    assert success is True, "Test release: Exclude scan failded"
+
+    assert os.path.exists("test_scan2/scan_exclude_result.csv"), "Test Release: scan_exclude_result.csv file not generated"
+
+    with open("test_scan2/scan_exclude_result.csv", 'r') as file:
+        content = file.read()
+
+    assert len(content) > 0, "Test Release: scan_exclude_result.csv is empty"
+    print(f"Content of scan_exclude_result.csv:\n{content}")
+
+
+def test_json_command():
+    success, _ = run_command("fosslight_source -p tests/test_files -m -j -o test_scan3/")
+    assert success is True, "Test release: Failed to generate JSON files"
+
+
+def test_ls_test_scan3_command():
+    files_in_test_scan3 = os.listdir("test_scan3")
+    assert len(files_in_test_scan3) > 0, "Test Release: test_scan3 is empty"
+    print(f"Files in test_scan3: {files_in_test_scan3}")
+
+
+def test_flake8():
+    success, _ = run_command("flake8 -j 4")
+    assert success is True, "Flake8: Style check failed"