fosslight-dependency 4.1.9__py3-none-any.whl → 4.1.11__py3-none-any.whl

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/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.dist-info → fosslight_dependency-4.1.11.dist-info}/METADATA

@@ -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
@@ -62,13 +62,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.dist-info → fosslight_dependency-4.1.11.dist-info}/RECORD

@@ -9,7 +9,7 @@ fosslight_dependency/run_dependency_scanner.py,sha256=rCHwKW2NsOSRyRxsFmUunKruK9
 fosslight_dependency/LICENSES/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 fosslight_dependency/LICENSES/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
 fosslight_dependency/package_manager/Android.py,sha256=0UZFvbLxDIreerK4fR316YPyhUpPliV_kfZulrxkUyo,3218
-fosslight_dependency/package_manager/Cargo.py,sha256=I27IKtUFf2fOr9ZngB8T9x6pPYhpk1m5CxbwM1dw9rk,5898
+fosslight_dependency/package_manager/Cargo.py,sha256=erAHVVbnRW5KUHVcrPgaHFGJOClpnf4Oi-8HbnSuCaY,5918
 fosslight_dependency/package_manager/Carthage.py,sha256=VU506KafUiHBrr_62iOOXNI1fDOreOQgcC2EWM5PpQo,6122
 fosslight_dependency/package_manager/Cocoapods.py,sha256=k_URV1ekMOU8l_y9_KIp_luu96ZGOl1xLIkH737VREA,8524
 fosslight_dependency/package_manager/Go.py,sha256=O-6DTTRM2EoTpCVmlIPKFy8ZTz64EHTooOAoUimjeyk,6491
@@ -20,16 +20,16 @@ fosslight_dependency/package_manager/Npm.py,sha256=EvXXJUJ3-4cyvGNQU2cXPGkOcOQPr
 fosslight_dependency/package_manager/Nuget.py,sha256=x1SPdxwXS2Oyi1RnLasvJJL-IFJl45VI2CXt3wReW24,8884
 fosslight_dependency/package_manager/Pnpm.py,sha256=LDKooFGQHui_Q5U7XqSJ8KcCPiLVndXf5oGKTJExh5w,7056
 fosslight_dependency/package_manager/Pub.py,sha256=Rrz8_6wdrmMU6f3vbbuAwyMbODBauXNnBbI619OQgDk,10184
-fosslight_dependency/package_manager/Pypi.py,sha256=A3pXJC_7H7PTa6i3B_PvJY85qsc6W9AqOze7kB8E3Ws,15831
+fosslight_dependency/package_manager/Pypi.py,sha256=LPeI7amFXKxhXMSRwiVaKfhHL_D7IGUy5j0F9HBoVmE,16709
 fosslight_dependency/package_manager/Swift.py,sha256=8fdbdAXTNlp2NDoSqQXm48JGAg9UhxA91M1-NhHkT40,6752
 fosslight_dependency/package_manager/Unity.py,sha256=n1006GZ6Qrk8wAdO6wla1Q-JD7Evin7REVj-HDeTARc,5142
 fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_dependency-4.1.9.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.9.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-4.1.9.dist-info/METADATA,sha256=16aIkcJigbjdeWlh6yp9jFBwrQjjpEZR-yrpGA1ohDY,4984
-fosslight_dependency-4.1.9.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-4.1.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_dependency-4.1.9.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
-fosslight_dependency-4.1.9.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-4.1.9.dist-info/RECORD,,
+fosslight_dependency-4.1.11.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.11.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-4.1.11.dist-info/METADATA,sha256=JISBXkWlFao4FSg3zHDcER45_tvRIWHN_I0eAouymKw,5103
+fosslight_dependency-4.1.11.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-4.1.11.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_dependency-4.1.11.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
+fosslight_dependency-4.1.11.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-4.1.11.dist-info/RECORD,,