Merge pull request #165 from snyk/fix/repeating-dependency

fix: fix 'key psutil not found in packageToDepTreeMap' error

pysrc/pip_resolve.py

@@ -84,7 +84,7 @@ def create_children_recursive(root_package, key_tree, ancestors, all_packages_ma
             if DEPENDENCIES not in root_package:
                 root_package[DEPENDENCIES] = {}
 
-            if child_project_name in all_packages_map:
+            if child_project_name in all_packages_map and child_project_name not in root_package[DEPENDENCIES]:
                 root_package[DEPENDENCIES][child_project_name] = 'true'
                 continue
 

test/system/inspect.test.js

@@ -670,6 +670,29 @@ test('package installed conditionally based on python version', (t) => {
     });
 });
 
+test('should return correct package info when a single package has a dependency more than once', (t) => {
+  return Promise.resolve()
+    .then(() => {
+      chdirWorkspaces('pip-app-with-repeating-dependency');
+      const venvCreated = testUtils.ensureVirtualenv(
+        'pip-app-with-repeating-dependency'
+      );
+      t.teardown(
+        testUtils.activateVirtualenv('pip-app-with-repeating-dependency')
+      );
+      if (venvCreated) {
+        testUtils.pipInstall();
+      }
+    })
+    .then(() => {
+      return plugin.inspect('.', 'requirements.txt');
+    })
+    .then(async (result) => {
+      t.ok(result.dependencyGraph, 'graph generated');
+      t.end();
+    });
+});
+
 test('Pipfile package found conditionally based on python version', (t) => {
   return Promise.resolve()
     .then(() => {

test/workspaces/pip-app-with-repeating-dependency/requirements.txt

@@ -0,0 +1,2 @@
+# the gevent package  has 'psutil' twice as a dependency (probably with different requirements)
+gevent==21.1.2