scanoss 1.26.1__tar.gz → 1.26.3__tar.gz

{scanoss-1.26.1/src/scanoss.egg-info → scanoss-1.26.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scanoss
-Version: 1.26.1
+Version: 1.26.3
 Summary: Simple Python library to leverage the SCANOSS APIs
 Home-page: https://scanoss.com
 Author: SCANOSS

{scanoss-1.26.1 → scanoss-1.26.3}/src/scanoss/__init__.py

@@ -22,4 +22,4 @@ SPDX-License-Identifier: MIT
   THE SOFTWARE.
 """
 
-__version__ = '1.26.1'
+__version__ = '1.26.3'

scanoss-1.26.3/src/scanoss/data/build_date.txt

@@ -0,0 +1 @@
+date: 20250626171827, utime: 1750958307

{scanoss-1.26.1 → scanoss-1.26.3}/src/scanoss/inspection/copyleft.py

@@ -37,7 +37,7 @@ class Copyleft(PolicyCheck):
     def __init__( # noqa: PLR0913
         self,
         debug: bool = False,
-        trace: bool = True,
+        trace: bool = False,
         quiet: bool = False,
         filepath: str = None,
         format_type: str = 'json',

{scanoss-1.26.1 → scanoss-1.26.3}/src/scanoss/inspection/inspect_base.py

@@ -66,7 +66,7 @@ class InspectBase(ScanossBase):
     def __init__( # noqa: PLR0913
         self,
         debug: bool = False,
-        trace: bool = True,
+        trace: bool = False,
         quiet: bool = False,
         filepath: str = None,
         output: str = None,
@@ -152,9 +152,6 @@ class InspectBase(ScanossBase):
             'declared': 1 if status == 'identified' else 0,
             'undeclared': 1 if status == 'pending' else 0
         }
-        if not new_component.get('licenses'):
-            self.print_debug(f'WARNING: Results missing licenses. Skipping: {new_component}')
-            return components
 
         ## Append license to component
         self._append_license_to_component(components, new_component, component_key)
@@ -179,6 +176,11 @@ class InspectBase(ScanossBase):
             new_component: Component whose licenses need to be processed
             component_key: purl + version of the component to be updated
         """
+        # If not licenses are present
+        if not new_component.get('licenses'):
+            self.print_debug(f'WARNING: Results missing licenses. Skipping: {new_component}')
+            return
+
         licenses_order_by_source_priority = self._get_licenses_order_by_source_priority(new_component['licenses'])
         # Process licenses for this component
         for license_item in licenses_order_by_source_priority:
@@ -393,14 +395,31 @@ class InspectBase(ScanossBase):
         """
         component_licenses: dict = {}
         for component in components:
-            for lic in component['licenses']:
-                spdxid = lic.get('spdxid', 'Unknown')
+            purl = component.get('purl', '')
+            status = component.get('status', '')
+            licenses = component.get('licenses', [])
+
+            # Component without license
+            if not licenses:
+                key = f'{purl}-unknown'
+                component_licenses[key] = {
+                    'purl': purl,
+                    'spdxid': 'unknown',
+                    'status': status,
+                    'copyleft': False,
+                    'url': '-',
+                }
+                continue
+
+            # Iterate over licenses component licenses
+            for lic in licenses:
+                spdxid = lic.get('spdxid', 'unknown')
                 if spdxid not in component_licenses:
-                    key = f'{component["purl"]}-{spdxid}'
+                    key = f'{purl}-{spdxid}'
                     component_licenses[key] = {
-                        'purl': component['purl'],
+                        'purl': purl,
                         'spdxid': spdxid,
-                        'status': component['status'],
+                        'status': status,
                         'copyleft': lic['copyleft'],
                         'url': lic['url'],
                     }

{scanoss-1.26.1 → scanoss-1.26.3}/src/scanoss/inspection/license_summary.py

@@ -42,7 +42,7 @@ class LicenseSummary(InspectBase):
     def __init__( # noqa: PLR0913
         self,
         debug: bool = False,
-        trace: bool = True,
+        trace: bool = False,
         quiet: bool = False,
         filepath: str = None,
         status: str = None,

{scanoss-1.26.1 → scanoss-1.26.3}/src/scanoss/inspection/policy_check.py

@@ -64,7 +64,7 @@ class PolicyCheck(InspectBase):
     def __init__(  # noqa: PLR0913
             self,
             debug: bool = False,
-            trace: bool = True,
+            trace: bool = False,
             quiet: bool = False,
             filepath: str = None,
             format_type: str = None,

{scanoss-1.26.1 → scanoss-1.26.3}/src/scanoss/inspection/undeclared_component.py

@@ -37,7 +37,7 @@ class UndeclaredComponent(PolicyCheck):
     def __init__( # noqa: PLR0913
         self,
         debug: bool = False,
-        trace: bool = True,
+        trace: bool = False,
         quiet: bool = False,
         filepath: str = None,
         format_type: str = 'json',

{scanoss-1.26.1 → scanoss-1.26.3/src/scanoss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scanoss
-Version: 1.26.1
+Version: 1.26.3
 Summary: Simple Python library to leverage the SCANOSS APIs
 Home-page: https://scanoss.com
 Author: SCANOSS

{scanoss-1.26.1 → scanoss-1.26.3}/tests/test_policy_inspect.py

@@ -181,11 +181,14 @@ class MyTestCase(unittest.TestCase):
         status, results = undeclared.run()
         details = json.loads(results['details'])
         summary = results['summary']
-        expected_summary_output = """2 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
         Add the following snippet into your `sbom.json` file 
         ```json 
         {
             "components":[
+                  {
+                    "purl": "pkg:github/scanoss/jenkins-pipeline-example"
+                  },
                   {
                     "purl": "pkg:github/scanoss/scanner.c"
                   },
@@ -195,7 +198,7 @@ class MyTestCase(unittest.TestCase):
             ]
         }```
         """
-        self.assertEqual(len(details['components']), 3)
+        self.assertEqual(len(details['components']), 4)
         self.assertEqual(
             re.sub(r'\s|\\(?!`)|\\(?=`)', '', summary), re.sub(r'\s|\\(?!`)|\\(?=`)', '', expected_summary_output)
         )
@@ -216,14 +219,18 @@ class MyTestCase(unittest.TestCase):
         expected_details_output = """ ### Undeclared components
              | Component | License | 
              | - | - | 
+             | pkg:github/scanoss/jenkins-pipeline-example | unknown | 
              | pkg:github/scanoss/scanner.c | GPL-2.0-only | 
              | pkg:github/scanoss/wfp | GPL-2.0-only |  """
 
-        expected_summary_output = """2 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
            Add the following snippet into your `sbom.json` file 
            ```json 
                {
                 "components":[
+                 {
+                    "purl": "pkg:github/scanoss/jenkins-pipeline-example"
+                 },
                  {
                     "purl": "pkg:github/scanoss/scanner.c"
                   },
@@ -256,16 +263,20 @@ class MyTestCase(unittest.TestCase):
         expected_details_output = """ ### Undeclared components
                | Component | License | 
                | - | - | 
+               | pkg:github/scanoss/jenkins-pipeline-example | unknown |
                | pkg:github/scanoss/scanner.c | GPL-2.0-only | 
                | pkg:github/scanoss/wfp | GPL-2.0-only | """
 
-        expected_summary_output = """2 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
             Add the following snippet into your `scanoss.json` file
             
             ```json
             {
               "bom": {
                 "include": [
+                  {
+                    "purl": "pkg:github/scanoss/jenkins-pipeline-example"
+                  },
                   {
                     "purl": "pkg:github/scanoss/scanner.c"
                   },
@@ -296,13 +307,16 @@ class MyTestCase(unittest.TestCase):
         status, results = undeclared.run()
         details = json.loads(results['details'])
         summary = results['summary']
-        expected_summary_output = """2 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
                 Add the following snippet into your `scanoss.json` file
 
                 ```json
                 {
                   "bom": {
                     "include": [
+                      {
+                        "purl": "pkg:github/scanoss/jenkins-pipeline-example"
+                      },
                       {
                         "purl": "pkg:github/scanoss/scanner.c"
                       },
@@ -314,7 +328,7 @@ class MyTestCase(unittest.TestCase):
                 }
                 ```"""
         self.assertEqual(status, 0)
-        self.assertEqual(len(details['components']), 3)
+        self.assertEqual(len(details['components']), 4)
         self.assertEqual(
             re.sub(r'\s|\\(?!`)|\\(?=`)', '', summary), re.sub(r'\s|\\(?!`)|\\(?=`)', '', expected_summary_output)
         )
@@ -328,15 +342,19 @@ class MyTestCase(unittest.TestCase):
         details = results['details']
         summary = results['summary']
         expected_details_output = """|*Component*|*License*|
+|pkg:github/scanoss/jenkins-pipeline-example|unknown|
 |pkg:github/scanoss/scanner.c|GPL-2.0-only|
 |pkg:github/scanoss/wfp|GPL-2.0-only|
 """
-        expected_summary_output = """2 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
 Add the following snippet into your `scanoss.json` file
 {code:json}
 {
   "bom": {
     "include": [
+      {
+        "purl": "pkg:github/scanoss/jenkins-pipeline-example"
+      },
       {
         "purl": "pkg:github/scanoss/scanner.c"
       },
@@ -373,7 +391,7 @@ Add the following snippet into your `scanoss.json` file
         input_file_name = os.path.join(script_dir, 'data', file_name)
         i_license_summary = LicenseSummary(filepath=input_file_name)
         license_summary = i_license_summary.run()
-        self.assertEqual(license_summary['detectedLicenses'], 2)
+        self.assertEqual(license_summary['detectedLicenses'], 3)
         self.assertEqual(license_summary['detectedLicensesWithCopyleft'], 1)
 
     def test_inspect_license_summary_with_empty_result(self):
@@ -393,11 +411,11 @@ Add the following snippet into your `scanoss.json` file
         i_component_summary = ComponentSummary(filepath=input_file_name)
         component_summary = i_component_summary.run()
         print(component_summary)
-        self.assertEqual(component_summary['totalComponents'], 3)
-        self.assertEqual(component_summary['undeclaredComponents'], 2)
+        self.assertEqual(component_summary['totalComponents'], 4)
+        self.assertEqual(component_summary['undeclaredComponents'], 3)
         self.assertEqual(component_summary['declaredComponents'], 1)
-        self.assertEqual(component_summary['totalFilesDetected'], 7)
-        self.assertEqual(component_summary['totalFilesUndeclared'], 5)
+        self.assertEqual(component_summary['totalFilesDetected'], 10)
+        self.assertEqual(component_summary['totalFilesUndeclared'], 8)
         self.assertEqual(component_summary['totalFilesDeclared'], 2)
 
     def test_inspect_component_summary_empty_result(self):

{scanoss-1.26.1 → scanoss-1.26.3}/tests/test_spdxlite.py

@@ -58,8 +58,8 @@ class MyTestCase(unittest.TestCase):
             self.assertEqual(name, "SCANOSS-SBOM")
             self.assertEqual(organization, "Organization: SCANOSS")
             self.assertEqual(creation_info_comment, "SBOM Build information - SBOM Type: Build")
-            self.assertEqual(len(document_describes), 5)
-            self.assertEqual(len(packages), 5)
+            self.assertEqual(len(document_describes), 6)
+            self.assertEqual(len(packages), 6)
 
             for package in packages:
                 for checksum in package.get("checksums", []):

scanoss-1.26.1/src/scanoss/data/build_date.txt

@@ -1 +0,0 @@
-date: 20250623123500, utime: 1750682100