fosslight-dependency 3.13.6__tar.gz → 3.13.8__tar.gz

{fosslight_dependency-3.13.6 → fosslight_dependency-3.13.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_dependency
-Version: 3.13.6
+Version: 3.13.8
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-3.13.6 → fosslight_dependency-3.13.8}/setup.py

@@ -35,7 +35,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='3.13.6',
+        version='3.13.8',
         package_dir={"": "src"},
         packages=find_namespace_packages(where='src'),
         description='FOSSLight Dependency Scanner',

{fosslight_dependency-3.13.6 → fosslight_dependency-3.13.8}/src/fosslight_dependency/package_manager/Maven.py

@@ -146,12 +146,16 @@ class Maven(PackageManager):
             logger.error(f"Failed to run maven plugin: {cmd}")
 
         cmd = f"{cmd_mvn} dependency:tree"
-        ret_txt = subprocess.check_output(cmd, text=True, shell=True)
-        if ret_txt is not None:
-            self.parse_dependency_tree(ret_txt)
-            self.set_direct_dependencies(True)
-        else:
-            logger.error(f"Failed to run: {cmd}")
+        try:
+            ret_txt = subprocess.check_output(cmd, text=True, shell=True)
+            if ret_txt is not None:
+                self.parse_dependency_tree(ret_txt)
+                self.set_direct_dependencies(True)
+            else:
+                logger.error(f"Failed to run: {cmd}")
+                self.set_direct_dependencies(False)
+        except Exception as e:
+            logger.error(f"Failed to run '{cmd}': {e}")
             self.set_direct_dependencies(False)
 
     def create_dep_stack(self, dep_line):

{fosslight_dependency-3.13.6 → fosslight_dependency-3.13.8}/src/fosslight_dependency/package_manager/Npm.py

@@ -103,7 +103,7 @@ class Npm(PackageManager):
         err_msg = ''
 
         cmd = 'npm ls -a --omit=dev --json -s'
-        result = subprocess.run(cmd, shell=True, capture_output=True, text=True)
+        result = subprocess.run(cmd, shell=True, capture_output=True, text=True, encoding='utf-8')
         rel_tree = result.stdout
         if rel_tree is None:
             logger.error(f"It returns the error: {cmd}")

{fosslight_dependency-3.13.6 → fosslight_dependency-3.13.8}/src/fosslight_dependency/package_manager/Pypi.py

@@ -9,6 +9,7 @@ import subprocess
 import json
 import shutil
 import copy
+import re
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
@@ -267,6 +268,7 @@ class Pypi(PackageManager):
 
             for d in json_data:
                 oss_init_name = d['Name']
+                oss_init_name = re.sub(r"[-_.]+", "-", oss_init_name).lower()
                 oss_name = f"{self.package_manager_name}:{oss_init_name}"
                 license_name = check_UNKNOWN(d['License'])
                 homepage = check_UNKNOWN(d['URL'])

{fosslight_dependency-3.13.6 → fosslight_dependency-3.13.8}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 3.13.6
+Version: 3.13.8
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics