scanoss 1.37.0__tar.gz → 1.38.0__tar.gz

{scanoss-1.37.0/src/scanoss.egg-info → scanoss-1.38.0}/PKG-INFO

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

{scanoss-1.37.0 → scanoss-1.38.0}/src/scanoss/__init__.py

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

{scanoss-1.37.0 → scanoss-1.38.0}/src/scanoss/cli.py

@@ -929,10 +929,7 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
     )
 
     delta_sub = p_delta.add_subparsers(
-        title='Delta Commands',
-        dest='subparsercmd',
-        description='Delta sub-commands',
-        help='Delta sub-commands'
+        title='Delta Commands', dest='subparsercmd', description='Delta sub-commands', help='Delta sub-commands'
     )
 
     # Delta Sub-command: copy
@@ -1165,9 +1162,15 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
         p_crypto_versions_in_range,
         c_licenses,
         e_dt,
-        p_copy
+        p_copy,
     ]:
-        p.add_argument('--debug', '-d', action='store_true', help='Enable debug messages')
+        p.add_argument(
+            '--debug',
+            '-d',
+            action='store_true',
+            default=os.environ.get('SCANOSS_DEBUG', '').lower() == 'true',
+            help='Enable debug messages (can also be set via environment variable SCANOSS_DEBUG)',
+        )
         p.add_argument('--trace', '-t', action='store_true', help='Enable trace messages, including API posts')
         p.add_argument('--quiet', '-q', action='store_true', help='Enable quiet mode')
 
@@ -1186,8 +1189,21 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
         sys.exit(1)
     elif (
         args.subparser
-        in ('utils', 'ut', 'component', 'comp', 'inspect', 'insp', 'ins',
-            'crypto', 'cr', 'export', 'exp', 'delta', 'dl')
+        in (
+            'utils',
+            'ut',
+            'component',
+            'comp',
+            'inspect',
+            'insp',
+            'ins',
+            'crypto',
+            'cr',
+            'export',
+            'exp',
+            'delta',
+            'dl',
+        )
     ) and not args.subparsercmd:
         parser.parse_args([args.subparser, '--help'])  # Force utils helps to be displayed
         sys.exit(1)
@@ -2634,6 +2650,7 @@ def initialise_empty_file(filename: str):
             print_stderr(f'Error: Unable to create output file {filename}: {e}')
             sys.exit(1)
 
+
 def delta_copy(parser, args):
     """
     Handle delta copy command.
@@ -2661,8 +2678,15 @@ def delta_copy(parser, args):
         initialise_empty_file(args.output)
     try:
         # Create and configure delta copy command
-        delta = Delta(debug=args.debug, trace=args.trace, quiet=args.quiet, filepath=args.input, folder=args.folder,
-                      output=args.output, root_dir=args.root)
+        delta = Delta(
+            debug=args.debug,
+            trace=args.trace,
+            quiet=args.quiet,
+            filepath=args.input,
+            folder=args.folder,
+            output=args.output,
+            root_dir=args.root,
+        )
         # Execute copy and exit with appropriate status code
         status, _ = delta.copy()
         sys.exit(status)
@@ -2672,6 +2696,7 @@ def delta_copy(parser, args):
             traceback.print_exc()
         sys.exit(1)
 
+
 def main():
     """
     Run the ScanOSS CLI

{scanoss-1.37.0 → scanoss-1.38.0}/src/scanoss/cyclonedx.py

@@ -152,7 +152,11 @@ class CycloneDx(ScanossBase):
                     fdl = []
                     if licenses:
                         for lic in licenses:
-                            fdl.append({'id': lic.get('name')})
+                            name = lic.get('name')
+                            source = lic.get('source')
+                            if source not in ('component_declared', 'license_file', 'file_header'):
+                                continue
+                            fdl.append({'id': name})
                     fd['licenses'] = fdl
                     cdx[purl] = fd
         # self.print_stderr(f'VD: {vdx}')
@@ -295,7 +299,8 @@ class CycloneDx(ScanossBase):
         except Exception as e:
             self.print_stderr(f'ERROR: Problem parsing input JSON: {e}')
             return False
-        return self.produce_from_json(data, output_file)
+        success, _ = self.produce_from_json(data, output_file)
+        return success
 
     def _normalize_vulnerability_id(self, vuln: dict) -> tuple[str, str]:
         """

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

@@ -0,0 +1 @@
+date: 20251024131920, utime: 1761311960

{scanoss-1.37.0 → scanoss-1.38.0}/src/scanoss/spdxlite.py

@@ -226,7 +226,9 @@ class SpdxLite:
             Process license information and remove duplicates.
 
             This method filters license information to include only licenses from trusted sources
-            ('component_declared' or 'license_file') and removes any duplicate license names.
+            ('component_declared', 'license_file', 'file_header'). Licenses with an unspecified
+            source (None or '') are allowed. Non-empty, non-allowed sources are excluded. It also
+            removes any duplicate license names.
             The result is a simplified list of license dictionaries containing only the 'id' field.
 
             Args:
@@ -247,7 +249,7 @@ class SpdxLite:
         for license_info in licenses:
             name = license_info.get('name')
             source = license_info.get('source')
-            if source not in ("component_declared", "license_file", "file_header"):
+            if source not in (None, '') and source not in ("component_declared", "license_file", "file_header"):
                 continue
             if name and name not in seen_names:
                 processed_licenses.append({'id': name})

{scanoss-1.37.0 → scanoss-1.38.0/src/scanoss.egg-info}/PKG-INFO

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

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

@@ -1 +0,0 @@
-date: 20251017144212, utime: 1760712132