scanoss 1.13.0__tar.gz → 1.14.0__tar.gz

{scanoss-1.13.0/src/scanoss.egg-info → scanoss-1.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scanoss
-Version: 1.13.0
+Version: 1.14.0
 Summary: Simple Python library to leverage the SCANOSS APIs
 Home-page: https://scanoss.com
 Author: SCANOSS
@@ -25,6 +25,7 @@ Requires-Dist: protobuf>3.19.1
 Requires-Dist: pypac
 Requires-Dist: pyOpenSSL
 Requires-Dist: google-api-core
+Requires-Dist: importlib_resources
 Provides-Extra: fast-winnowing
 Requires-Dist: scanoss_winnowing>=0.5.0; extra == "fast-winnowing"
 

{scanoss-1.13.0 → scanoss-1.14.0}/setup.cfg

@@ -34,6 +34,7 @@ install_requires =
 	pypac
 	pyOpenSSL
 	google-api-core
+	importlib_resources
 
 [options.extras_require]
 fast_winnowing = 

{scanoss-1.13.0 → scanoss-1.14.0}/src/scanoss/__init__.py

@@ -22,4 +22,4 @@
    THE SOFTWARE.
 """
 
-__version__ = '1.13.0'
+__version__ = '1.14.0'

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

@@ -0,0 +1 @@
+date: 20240829161941, utime: 1724948381

{scanoss-1.13.0 → scanoss-1.14.0}/src/scanoss/scanner.py

@@ -25,7 +25,7 @@ import json
 import os
 import sys
 import datetime
-import pkg_resources
+import importlib_resources
 
 from progress.bar import Bar
 from progress.spinner import Spinner
@@ -270,9 +270,10 @@ class Scanner(ScanossBase):
         """
         data = None
         try:
-            f_name = pkg_resources.resource_filename(__name__, 'data/build_date.txt')
-            with open(f_name, 'r') as f:
-                data = f.read().rstrip()
+            f_name = importlib_resources.files(__name__) / 'data/build_date.txt'
+            with importlib_resources.as_file(f_name) as f:
+                with open(f, 'r', encoding='utf-8') as file:
+                    data = file.read().rstrip()
         except Exception as e:
             Scanner.print_stderr(f'Warning: Problem loading build time details: {e}')
         if not data or len(data) == 0:

{scanoss-1.13.0 → scanoss-1.14.0}/src/scanoss/spdxlite.py

@@ -28,7 +28,7 @@ import hashlib
 import datetime
 import getpass
 import re
-import pkg_resources
+import importlib_resources
 
 from . import __version__
 
@@ -300,9 +300,10 @@ class SpdxLite:
         :return: True if successful, False otherwise
         """
         try:
-            f_name = pkg_resources.resource_filename(__name__, filename)
-            with open(f_name, 'r') as f:
-                data = json.loads(f.read())
+            f_name = importlib_resources.files(__name__) / filename
+            with importlib_resources.as_file(f_name) as f:
+                with open(f, 'r', encoding='utf-8') as file:
+                    data = json.load(file)
         except Exception as e:
             self.print_stderr(f'ERROR: Problem parsing SPDX license input JSON: {e}')
             return False

{scanoss-1.13.0 → scanoss-1.14.0}/src/scanoss/winnowing.py

@@ -307,7 +307,7 @@ class Winnowing(ScanossBase):
             return ''
         # Print file line
         content_length = len(contents)
-        wfp_filename = file
+        wfp_filename = repr(file).strip("'")  # return a utf-8 compatible version of the filename
         if self.obfuscate:  # hide the real size of the file and its name, but keep the suffix
             wfp_filename = f'{self.ob_count}{pathlib.Path(file).suffix}'
             self.ob_count = self.ob_count + 1

{scanoss-1.13.0 → scanoss-1.14.0/src/scanoss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scanoss
-Version: 1.13.0
+Version: 1.14.0
 Summary: Simple Python library to leverage the SCANOSS APIs
 Home-page: https://scanoss.com
 Author: SCANOSS
@@ -25,6 +25,7 @@ Requires-Dist: protobuf>3.19.1
 Requires-Dist: pypac
 Requires-Dist: pyOpenSSL
 Requires-Dist: google-api-core
+Requires-Dist: importlib_resources
 Provides-Extra: fast-winnowing
 Requires-Dist: scanoss_winnowing>=0.5.0; extra == "fast-winnowing"
 

{scanoss-1.13.0 → scanoss-1.14.0}/src/scanoss.egg-info/requires.txt

@@ -7,6 +7,7 @@ protobuf>3.19.1
 pypac
 pyOpenSSL
 google-api-core
+importlib_resources
 
 [fast_winnowing]
 scanoss_winnowing>=0.5.0

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

@@ -1 +0,0 @@
-date: 20240605132032, utime: 1717593632