fosslight-dependency 4.1.9__tar.gz → 4.1.11__tar.gz

{fosslight_dependency-4.1.9 → fosslight_dependency-4.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_dependency
-Version: 4.1.9
+Version: 4.1.11
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics
@@ -39,13 +39,20 @@ Description: <!--
         </thead>
         <tbody>
           <tr>
-            <td>Javascript</td>
+            <td rowspan="2">Javascript</td>
             <td>Npm</td>
             <td>package.json</td>
             <td>O</td>
             <td>O</td>
             <td>O</td>
           </tr>
+          <tr>
+            <td>Pnpm</td>
+            <td>pnpm-lock.yaml</td>
+            <td>O</td>
+            <td>O</td>
+            <td>O</td>
+          </tr>
           <tr>
             <td rowspan="2">Java</td>
             <td>Gradle</td>

{fosslight_dependency-4.1.9 → fosslight_dependency-4.1.11}/README.md

@@ -31,13 +31,20 @@ In this user guide, you can see how to install the FOSSLight Dependency Scanner
 </thead>
 <tbody>
   <tr>
-    <td>Javascript</td>
+    <td rowspan="2">Javascript</td>
     <td>Npm</td>
     <td>package.json</td>
     <td>O</td>
     <td>O</td>
     <td>O</td>
   </tr>
+  <tr>
+    <td>Pnpm</td>
+    <td>pnpm-lock.yaml</td>
+    <td>O</td>
+    <td>O</td>
+    <td>O</td>
+  </tr>
   <tr>
     <td rowspan="2">Java</td>
     <td>Gradle</td>

{fosslight_dependency-4.1.9 → fosslight_dependency-4.1.11}/setup.py

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

{fosslight_dependency-4.1.9 → fosslight_dependency-4.1.11}/src/fosslight_dependency/package_manager/Cargo.py

@@ -132,11 +132,11 @@ def get_matched_dependencies(match_id, resolve_node):
                 try:
                     match = re.findall(r'^.*#(\S*)@(\S*)', dep_pkg)
                     dependencies_list.append(f'{match[0][0]}({match[0][1]})')
-                except:
+                except Exception:
                     try:
                         match = re.findall(r'^(\S*)\s(\S*)\s', dep_pkg)
                         dependencies_list.append(f'{match[0][0]}({match[0][1]})')
-                    except:
+                    except Exception:
                         logger.info(f'cannot find name and version for dependencies: {match_id}')
                         pass
             break

{fosslight_dependency-4.1.9 → fosslight_dependency-4.1.11}/src/fosslight_dependency/package_manager/Pypi.py

@@ -129,15 +129,32 @@ class Pypi(PackageManager):
             if cmd_ret.returncode != 0:
                 ret = False
                 err_msg = f"return code({cmd_ret.returncode})"
-            elif cmd_ret.stderr.decode('utf-8').rstrip().startswith('ERROR:'):
+            elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'):
                 ret = False
                 err_msg = f"stderr msg({cmd_ret.stderr})"
         except Exception as e:
             ret = False
             err_msg = e
         finally:
+            try:
+                if (not ret) and (self.platform != const.WINDOWS):
+                    ret = True
+                    create_venv_cmd = f"virtualenv -p python3 {self.venv_tmp_dir}"
+
+                    cmd_list = [create_venv_cmd, activate_cmd, install_cmd, deactivate_cmd]
+                    cmd = cmd_separator.join(cmd_list)
+                    cmd_ret = subprocess.run(cmd, shell=True, stderr=subprocess.PIPE)
+                    if cmd_ret.returncode != 0:
+                        ret = False
+                        err_msg = f"return code({cmd_ret.returncode})"
+                    elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'):
+                        ret = False
+                        err_msg = f"stderr msg({cmd_ret.stderr})"
+            except Exception as e:
+                ret = False
+                err_msg = e
             if ret:
-                logger.info(f"It created the temporary virtualenv({venv_path}).")
+                logger.info(f"Created the temporary virtualenv({venv_path}).")
             else:
                 logger.error(f"Failed to create virtualenv: {err_msg}")
 

{fosslight_dependency-4.1.9 → fosslight_dependency-4.1.11}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 4.1.9
+Version: 4.1.11
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics
@@ -39,13 +39,20 @@ Description: <!--
         </thead>
         <tbody>
           <tr>
-            <td>Javascript</td>
+            <td rowspan="2">Javascript</td>
             <td>Npm</td>
             <td>package.json</td>
             <td>O</td>
             <td>O</td>
             <td>O</td>
           </tr>
+          <tr>
+            <td>Pnpm</td>
+            <td>pnpm-lock.yaml</td>
+            <td>O</td>
+            <td>O</td>
+            <td>O</td>
+          </tr>
           <tr>
             <td rowspan="2">Java</td>
             <td>Gradle</td>