scanoss 1.37.0__py3-none-any.whl → 1.38.0__py3-none-any.whl

scanoss/__init__.py

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

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/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/data/build_date.txt

@@ -1 +1 @@
-date: 20251017144212, utime: 1760712132
+date: 20251024131920, utime: 1761311960

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.dist-info → scanoss-1.38.0.dist-info}/METADATA

@@ -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.dist-info → scanoss-1.38.0.dist-info}/RECORD

@@ -6,13 +6,13 @@ protoc_gen_swagger/options/annotations_pb2_grpc.py,sha256=KZOW9Ciio-f9iL42FuLFnS
 protoc_gen_swagger/options/openapiv2_pb2.py,sha256=w0xDs63uyrWGgzRaQZXfJpfI7Jpyvh-i9ay_uzOR-aM,16475
 protoc_gen_swagger/options/openapiv2_pb2.pyi,sha256=hYOV6uQ2yqhP89042_V3GuAsvoBBiXf5CGuYmnFnfv4,54665
 protoc_gen_swagger/options/openapiv2_pb2_grpc.py,sha256=sje9Nh3yE7CHCUWZwtjTgwsKB4GvyGz5vOrGTnRXJfc,917
-scanoss/__init__.py,sha256=XOnhkCmqwWWkii_xE2t16Jl3weqDcvzxje1mYGvZL1Q,1146
-scanoss/cli.py,sha256=AV_tmWeCH_TxhKDOY3PR1zbLbDWt1yWa8CHpp-GABsY,97436
+scanoss/__init__.py,sha256=XYJ-FpfDnKK7tuc0ms8xzYcxUDkA9f2cQOSi2LvWfTA,1146
+scanoss/cli.py,sha256=1d6toykJ_rNY8XInFmzwXR2m6oB70GHO7kpb-uM-sm8,97834
 scanoss/components.py,sha256=NFyt_w3aoMotr_ZaFU-ng00_89sruc0kgY7ERnJXkmM,15891
 scanoss/constants.py,sha256=GHLTaLNVxXdTXRj7ngRK4u4S653pHzM8qFy4JFLa0wQ,450
 scanoss/cryptography.py,sha256=lOoD_dW16ARQxYiYyb5R8S7gx0FqWIsnGkKfsB0nGaU,10627
 scanoss/csvoutput.py,sha256=3wdXPeIqZG84bCtXFh8fMZO3XodekeSx6RZXoOhZMFc,10551
-scanoss/cyclonedx.py,sha256=y5fI2E-95vv2iZeCCsXtzSdJJUK_piHC1THsbfbXEpA,18151
+scanoss/cyclonedx.py,sha256=mHeX66yQCk41N3YCIzKy_fI7fLqQnetYPFRIzUKy_M4,18416
 scanoss/delta.py,sha256=slmgnD7SsUOmfSE2zb0zdRAGo-JcjPJAtxyzuCSzO3I,9455
 scanoss/file_filters.py,sha256=QcLqunaBKQIafjNZ9_Snh9quBX5_-fsTusVmxwjC1q8,18511
 scanoss/filecount.py,sha256=RZjKQ6M5P_RQg0_PMD2tsRe5Z8f98ke0sxYVjPDN8iQ,6538
@@ -25,7 +25,7 @@ scanoss/scanossbase.py,sha256=Dkpwxa8NH8XN1iRl03NM_Mkvby0JQ4qfvCiiUrJ5ul0,3163
 scanoss/scanossgrpc.py,sha256=6s5TH2i3XB4xaXylmxFu7chlVlYjCZE_DpvRkiiaoHk,41541
 scanoss/scanpostprocessor.py,sha256=-JsThlxrU70r92GHykTMERnicdd-6jmwNsE4PH0MN2o,11063
 scanoss/scantype.py,sha256=gFmyVmKQpHWogN2iCmMj032e_sZo4T92xS3_EH5B3Tc,1310
-scanoss/spdxlite.py,sha256=sSEugYbtzgKB_hdFLPG6Q4rJBl01fhEU1QU_nXR0qhA,29247
+scanoss/spdxlite.py,sha256=4JMxmyNmvcL6fjScihk8toWfSuQ-Pj1gzaT3SIn1fXA,29425
 scanoss/threadeddependencies.py,sha256=aN8E43iKS1pWJLJP3xCle5ewlfR5DE2-ljUzI_29Xwk,9851
 scanoss/threadedscanning.py,sha256=38ryN_kZGpzmrd_hkuiY9Sb3tOG248canGCDQDmGEwI,9317
 scanoss/winnowing.py,sha256=RsR9jRTR3TzS1pEeKQ2RuYlIG8Q7RnUQFfgPLog6B-A,21679
@@ -64,7 +64,7 @@ scanoss/api/vulnerabilities/__init__.py,sha256=IFrDk_DTJgKSZmmU-nuLXuq_s8sQZlrSC
 scanoss/api/vulnerabilities/v2/__init__.py,sha256=IFrDk_DTJgKSZmmU-nuLXuq_s8sQZlrSCHhIDMJT4r0,1122
 scanoss/api/vulnerabilities/v2/scanoss_vulnerabilities_pb2.py,sha256=pmm0MSiXkdf8e4rCIIDRcsNRixR2vGvD1Xak4l-wdwI,16550
 scanoss/api/vulnerabilities/v2/scanoss_vulnerabilities_pb2_grpc.py,sha256=BNxT5kUKQ-mgtOt5QYBM1Qrg5LNDqSpWKpfEZquIlsM,19127
-scanoss/data/build_date.txt,sha256=n54sthXqFE_uitQWwA2OBIhvntuAusvCrN83jYV6dbY,40
+scanoss/data/build_date.txt,sha256=vIDp8v5oIkuI4Pxunu5cDrnq1xF9Ajjgdjwun5NfN74,40
 scanoss/data/scanoss-settings-schema.json,sha256=ClkRYAkjAN0Sk704G8BE_Ok006oQ6YnIGmX84CF8h9w,8798
 scanoss/data/spdx-exceptions.json,sha256=s7UTYxC7jqQXr11YBlIWYCNwN6lRDFTR33Y8rpN_dA4,17953
 scanoss/data/spdx-licenses.json,sha256=A6Z0q82gaTLtnopBfzeIVZjJFxkdRW1g2TuumQc-lII,228794
@@ -90,9 +90,9 @@ scanoss/utils/abstract_presenter.py,sha256=teiDTxBj5jBMCk2T8i4l1BJPf_u4zBLWrtCTF
 scanoss/utils/crc64.py,sha256=TMrwQimSdE6imhFOUL7oAG6Kxu-8qMpGWMuMg8QpSVs,3169
 scanoss/utils/file.py,sha256=62cA9a17TU9ZvfA3FY5HY4-QOajJeSrc8S6xLA_f-3M,2980
 scanoss/utils/simhash.py,sha256=6iu8DOcecPAY36SZjCOzrrLMT9oIE7-gI6QuYwUQ7B0,5793
-scanoss-1.37.0.dist-info/licenses/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
-scanoss-1.37.0.dist-info/METADATA,sha256=JPgOoHE1lzvW6ejzxv0CoMMxmo-Ku4zw3qSyrg2aLrM,6181
-scanoss-1.37.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scanoss-1.37.0.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
-scanoss-1.37.0.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
-scanoss-1.37.0.dist-info/RECORD,,
+scanoss-1.38.0.dist-info/licenses/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
+scanoss-1.38.0.dist-info/METADATA,sha256=nGYHuWaHvC-qnnBCwnLwVt3-jfPV1W3Riu0W_2QVraI,6181
+scanoss-1.38.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scanoss-1.38.0.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
+scanoss-1.38.0.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
+scanoss-1.38.0.dist-info/RECORD,,