scanoss 1.28.0__tar.gz → 1.28.2__tar.gz

{scanoss-1.28.0/src/scanoss.egg-info → scanoss-1.28.2}/PKG-INFO

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

{scanoss-1.28.0 → scanoss-1.28.2}/src/scanoss/__init__.py

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

{scanoss-1.28.0 → scanoss-1.28.2}/src/scanoss/cryptography.py

@@ -53,16 +53,16 @@ class CryptographyConfig:
                 raise ScanossCryptographyError('The supplied input file is not in the correct PurlRequest format.')
             purls = input_file_validation.data['purls']
             purls_with_requirement = []
-            if self.with_range:
-                if any('requirement' not in p for p in purls):
-                    raise ScanossCryptographyError(
-                        f'One or more PURLs in "{self.input_file}" are missing the "requirement" field.'
-                    )
+            if self.with_range and any('requirement' not in p for p in purls):
+                raise ScanossCryptographyError(
+                    f'One or more PURLs in "{self.input_file}" are missing the "requirement" field.'
+                )
+
+            for purl in purls:
+                if 'requirement' in purl:
+                    purls_with_requirement.append(f'{purl["purl"]}@{purl["requirement"]}')
                 else:
-                    for purl in purls:
-                        purls_with_requirement.append(f'{purl["purl"]}@{purl["requirement"]}')
-            else:
-                purls_with_requirement = purls
+                    purls_with_requirement.append(purl['purl'])
             self.purl = purls_with_requirement
 
 
@@ -198,13 +198,27 @@ class Cryptography:
         return {
             'purls': [
                 {
-                    'purl': p,
-                    'requirement': self._extract_version_from_purl(p),
+                    'purl': self._remove_version_from_purl(purl),
+                    'requirement': self._extract_version_from_purl(purl),
                 }
-                for p in self.config.purl
+                for purl in self.config.purl
             ]
         }
 
+    def _remove_version_from_purl(self, purl: str) -> str:
+        """
+        Remove version from purl
+
+        Args:
+            purl (str): The purl string to remove the version from
+
+        Returns:
+            str: The purl string without the version
+        """
+        if '@' not in purl:
+            return purl
+        return purl.split('@')[0]
+
     def _extract_version_from_purl(self, purl: str) -> str:
         """
         Extract version from purl

{scanoss-1.28.0 → scanoss-1.28.2}/src/scanoss/cyclonedx.py

@@ -219,6 +219,8 @@ class CycloneDx(ScanossBase):
                 lic_set = set()
                 for lic in licenses:  # Get a unique set of licenses
                     lc_id = lic.get('id')
+                    if not lc_id:
+                        continue
                     spdx_id = self._spdx.get_spdx_license_id(lc_id)
                     lic_set.add(spdx_id if spdx_id else lc_id)
                 for lc_id in lic_set:  # Store licenses for later inclusion

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

@@ -0,0 +1 @@
+date: 20250714124110, utime: 1752496870

{scanoss-1.28.0 → scanoss-1.28.2/src/scanoss.egg-info}/PKG-INFO

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

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

@@ -1 +0,0 @@
-date: 20250710142446, utime: 1752157486