fosslight-source 2.3.12__tar.gz → 2.3.14__tar.gz

{fosslight_source-2.3.12/src/fosslight_source.egg-info → fosslight_source-2.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.3.12
+Version: 2.3.14
 Summary: FOSSLight Source Scanner
 Author: LG Electronics
 License-Expression: Apache-2.0
@@ -20,11 +20,11 @@ Requires-Dist: setuptools<=80.10.2
 Requires-Dist: pyparsing
 Requires-Dist: scanoss>=1.45.0
 Requires-Dist: XlsxWriter
-Requires-Dist: fosslight_util>=2.2.12
+Requires-Dist: fosslight_util>=2.2.14
 Requires-Dist: PyYAML
 Requires-Dist: wheel>=0.38.1
 Requires-Dist: intbitset
-Requires-Dist: scancode-toolkit>=32.0.2
+Requires-Dist: scancode-toolkit>=32.5.0
 Requires-Dist: lxml>=6.0.1
 Requires-Dist: cryptography<49; platform_system == "Darwin" and platform_machine == "x86_64"
 Requires-Dist: fingerprints==1.2.3
@@ -55,7 +55,7 @@ Detect the license for the source code.
 Use Source Code Scanner and process the scanner results.
 ```
 
-**FOSSLight Source Scanner** uses source code scanners, [ScanCode][sc] and [SCANOSS][scanoss]. [ScanCode][sc] detects copyright and license phrases contained in the file and [SCANOSS][scanoss] searches OSS Name, OSS Version, download location, copyright and license information from [OSSKB][osskb]. Some files (ex- build script), binary files, directory and files in specific directories (ex-test) are excluded from the result. And removes words such as "-only" and "-old-style" from the license name to be printed. The output result is generated in spreadsheet format.
+**FOSSLight Source Scanner** uses source code scanners, [ScanCode][sc] and [SCANOSS][scanoss]. [ScanCode][sc] detects copyright and license phrases contained in the file and [SCANOSS][scanoss] searches OSS Name, OSS Version, download location, copyright and license information from [OSSKB][osskb]. Some files (ex- build script), binary files, directory and files in specific directories (ex-test) are excluded from the result. The output result is generated in spreadsheet format.
 
 
 [sc]: https://github.com/nexB/scancode-toolkit

{fosslight_source-2.3.12 → fosslight_source-2.3.14}/README.md

@@ -18,7 +18,7 @@ Detect the license for the source code.
 Use Source Code Scanner and process the scanner results.
 ```
 
-**FOSSLight Source Scanner** uses source code scanners, [ScanCode][sc] and [SCANOSS][scanoss]. [ScanCode][sc] detects copyright and license phrases contained in the file and [SCANOSS][scanoss] searches OSS Name, OSS Version, download location, copyright and license information from [OSSKB][osskb]. Some files (ex- build script), binary files, directory and files in specific directories (ex-test) are excluded from the result. And removes words such as "-only" and "-old-style" from the license name to be printed. The output result is generated in spreadsheet format.
+**FOSSLight Source Scanner** uses source code scanners, [ScanCode][sc] and [SCANOSS][scanoss]. [ScanCode][sc] detects copyright and license phrases contained in the file and [SCANOSS][scanoss] searches OSS Name, OSS Version, download location, copyright and license information from [OSSKB][osskb]. Some files (ex- build script), binary files, directory and files in specific directories (ex-test) are excluded from the result. The output result is generated in spreadsheet format.
 
 
 [sc]: https://github.com/nexB/scancode-toolkit

{fosslight_source-2.3.12 → fosslight_source-2.3.14}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fosslight_source"
-version = "2.3.12"
+version = "2.3.14"
 description = "FOSSLight Source Scanner"
 readme = "README.md"
 license = "Apache-2.0"
@@ -29,11 +29,11 @@ dependencies = [
     "pyparsing",
     "scanoss>=1.45.0",
     "XlsxWriter",
-    "fosslight_util>=2.2.12",
+    "fosslight_util>=2.2.14",
     "PyYAML",
     "wheel>=0.38.1",
     "intbitset",
-    "scancode-toolkit>=32.0.2",
+    "scancode-toolkit>=32.5.0",
     "lxml>=6.0.1",
     # cryptography 49.x does not provide macOS x86_64 wheels, causing source builds to require OpenSSL/pkg-config.
     "cryptography<49; platform_system == 'Darwin' and platform_machine == 'x86_64'",

{fosslight_source-2.3.12 → fosslight_source-2.3.14}/src/fosslight_source/_scan_item.py

@@ -12,7 +12,7 @@ import fosslight_util.constant as constant
 from fosslight_util.oss_item import FileItem, OssItem, get_checksum_sha1
 
 logger = logging.getLogger(constant.LOGGER_NAME)
-replace_word = ["-only", "-old-style", "-or-later", "licenseref-scancode-", "licenseref-"]
+replace_word = ["licenseref-scancode-", "licenseref-"]
 _notice_filename = ['licen[cs]e[s]?', 'notice[s]?', 'legal', 'copyright[s]?', 'copying*', 'patent[s]?', 'unlicen[cs]e', 'eula',
                     '[a,l]?gpl[-]?[1-3]?[.,-,_]?[0-1]?', 'mit', 'bsd[-]?[0-4]?', 'bsd[-]?[0-4][-]?clause[s]?',
                     'apache[-,_]?[1-2]?[.,-,_]?[0-2]?']

{fosslight_source-2.3.12 → fosslight_source-2.3.14}/src/fosslight_source/cli.py

@@ -176,15 +176,14 @@ def create_report_file(
         for i, output_extension in enumerate(output_extensions):
             if output_files[i] is None or output_files[i] == "":
                 if formats:
-                    if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
+                    if formats[i].startswith('spdx'):
                         if platform.system() == 'Windows':
                             logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.')
                             to_remove.append(i)
                         else:
-                            if formats[i].startswith('spdx'):
-                                output_files[i] = f"fosslight_spdx_src_{name_time}"
-                            elif formats[i].startswith('cyclonedx'):
-                                output_files[i] = f'fosslight_cyclonedx_src_{name_time}'
+                            output_files[i] = f"fosslight_spdx_src_{name_time}"
+                    elif formats[i].startswith('cyclonedx'):
+                        output_files[i] = f'fosslight_cyclonedx_src_{name_time}'
                     else:
                         if output_extension == _json_ext:
                             output_files[i] = f"fosslight_opossum_src_{name_time}"
@@ -276,7 +275,8 @@ def create_report_file(
         # if need_license and output_extension == _json_ext and "scanoss_reference" in sheet_list:
         #     del sheet_list["scanoss_reference"]
         result = write_output_file(
-            combined_path_and_file, output_extension, scan_item, hide_header="", format=output_format
+            combined_path_and_file, output_extension, scan_item, hide_header="", format=output_format,
+            scanner_covers=[scan_item.cover]
         )
         results.append(result)
     for success, msg, result_file in results:

{fosslight_source-2.3.12 → fosslight_source-2.3.14/src/fosslight_source.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.3.12
+Version: 2.3.14
 Summary: FOSSLight Source Scanner
 Author: LG Electronics
 License-Expression: Apache-2.0
@@ -20,11 +20,11 @@ Requires-Dist: setuptools<=80.10.2
 Requires-Dist: pyparsing
 Requires-Dist: scanoss>=1.45.0
 Requires-Dist: XlsxWriter
-Requires-Dist: fosslight_util>=2.2.12
+Requires-Dist: fosslight_util>=2.2.14
 Requires-Dist: PyYAML
 Requires-Dist: wheel>=0.38.1
 Requires-Dist: intbitset
-Requires-Dist: scancode-toolkit>=32.0.2
+Requires-Dist: scancode-toolkit>=32.5.0
 Requires-Dist: lxml>=6.0.1
 Requires-Dist: cryptography<49; platform_system == "Darwin" and platform_machine == "x86_64"
 Requires-Dist: fingerprints==1.2.3
@@ -55,7 +55,7 @@ Detect the license for the source code.
 Use Source Code Scanner and process the scanner results.
 ```
 
-**FOSSLight Source Scanner** uses source code scanners, [ScanCode][sc] and [SCANOSS][scanoss]. [ScanCode][sc] detects copyright and license phrases contained in the file and [SCANOSS][scanoss] searches OSS Name, OSS Version, download location, copyright and license information from [OSSKB][osskb]. Some files (ex- build script), binary files, directory and files in specific directories (ex-test) are excluded from the result. And removes words such as "-only" and "-old-style" from the license name to be printed. The output result is generated in spreadsheet format.
+**FOSSLight Source Scanner** uses source code scanners, [ScanCode][sc] and [SCANOSS][scanoss]. [ScanCode][sc] detects copyright and license phrases contained in the file and [SCANOSS][scanoss] searches OSS Name, OSS Version, download location, copyright and license information from [OSSKB][osskb]. Some files (ex- build script), binary files, directory and files in specific directories (ex-test) are excluded from the result. The output result is generated in spreadsheet format.
 
 
 [sc]: https://github.com/nexB/scancode-toolkit

{fosslight_source-2.3.12 → fosslight_source-2.3.14}/src/fosslight_source.egg-info/requires.txt

@@ -2,11 +2,11 @@ setuptools<=80.10.2
 pyparsing
 scanoss>=1.45.0
 XlsxWriter
-fosslight_util>=2.2.12
+fosslight_util>=2.2.14
 PyYAML
 wheel>=0.38.1
 intbitset
-scancode-toolkit>=32.0.2
+scancode-toolkit>=32.5.0
 lxml>=6.0.1
 fingerprints==1.2.3
 normality==2.6.1

{fosslight_source-2.3.12 → fosslight_source-2.3.14}/tests/test_parsing_unknown_spdx.py

@@ -107,8 +107,8 @@ def test_unknown_spdx_in_compound_expression_splits_and_or():
     success, results, _messages, _ = parsing_scancode(scancode_file_list)
 
     assert success is True
-    assert results[0].licenses == ["GPL-2.0", "MIT-like"]
-    assert results[0].comment == "GPL-2.0 OR MIT-like"
+    assert results[0].licenses == ["GPL-2.0-only", "MIT-like"]
+    assert results[0].comment == "GPL-2.0-only OR MIT-like"
 
 
 def test_unknown_spdx_comment_preserves_and_or_from_detected_expression():
@@ -171,7 +171,7 @@ def test_unknown_license_reference_suppressed_when_same_matched_text_has_other_l
     success, results, _messages, _ = parsing_scancode(scancode_file_list)
 
     assert success is True
-    assert results[0].licenses == ["GPL-2.0"]
+    assert results[0].licenses == ["GPL-2.0-only"]
 
 
 @pytest.mark.parametrize(
@@ -381,7 +381,7 @@ def test_build_comment_from_detected_expression_helper():
         matches,
         _should_suppress_unknown_license_reference(matches, has_other_license),
     )
-    assert comment == "NEW OR DApache-2.0 AND GPL-2.0"
+    assert comment == "NEW OR DApache-2.0 AND GPL-2.0-only"
 
 
 def test_comment_without_parens_uses_operator_before_kept_token():
@@ -554,7 +554,7 @@ def test_ignore_unknown_spdx_when_file_has_spdx_declaration():
     success, results, _messages, _ = parsing_scancode(scancode_file_list)
 
     assert success is True
-    assert results[0].licenses == ["GPL-2.0"]
+    assert results[0].licenses == ["GPL-2.0-only"]
     assert all("unknown" not in lic.lower() for lic in results[0].licenses)
     assert all("tag" not in lic.lower() for lic in results[0].licenses)
 
@@ -604,7 +604,7 @@ def test_spdx_priority_drops_body_rule_matches():
     success, results, _messages, _ = parsing_scancode(scancode_file_list)
 
     assert success is True
-    assert results[0].licenses == ["GPL-2.0"]
+    assert results[0].licenses == ["GPL-2.0-only"]
     # Body singles covered by OR expression are dropped; Detected keeps the OR form.
     assert results[0].comment == "Detected: gpl-2.0 OR bsd-simplified"
 
@@ -852,7 +852,7 @@ def test_spdx_priority_detected_comment_uses_spdx_ids():
     success, results, _messages, _ = parsing_scancode(scancode_file_list)
 
     assert success is True
-    assert results[0].licenses == ["GPL-2.0"]
+    assert results[0].licenses == ["GPL-2.0-only"]
     assert results[0].comment == (
         "Detected: GPL-2.0-only OR BSD-2-Clause, unknown-spdx"
     )