Merge pull request #5343 from pypa/bump-pipdeptree

Bump pipdeptree
pypa · Sep 8, 2022 · f2206e0 · f2206e0
2 parents 7501668 + 3f05bf4
commit f2206e0
Show file tree

Hide file tree

Showing 10 changed files with 362 additions and 358 deletions.
diff --git a/news/5343.vendor.rst b/news/5343.vendor.rst
@@ -0,0 +1 @@
+Bump version of pipdeptree
diff --git a/pipenv/core.py b/pipenv/core.py
@@ -2887,7 +2887,7 @@ def do_graph(project, bare=False, json=False, json_tree=False, reverse=False):
 
     from pipenv.vendor import pipdeptree
 
-    pipdeptree_path = pipdeptree.__file__.rstrip("cdo")
+    pipdeptree_path = os.path.dirname(pipdeptree.__file__.rstrip("cdo"))
     try:
         python_path = project._which("python")
     except AttributeError:

diff --git a/pipenv/environment.py b/pipenv/environment.py
@@ -689,7 +689,11 @@ def _get_requirements_for_package(cls, node, key_tree, parent=None, chain=None):
         return d
 
     def get_package_requirements(self, pkg=None):
-        from .vendor.pipdeptree import PackageDAG, flatten
+        from itertools import chain
+
+        from pipenv.vendor.pipdeptree import PackageDAG
+
+        flatten = chain.from_iterable
 
         packages = self.get_installed_packages()
         if pkg:

diff --git a/pipenv/vendor/pipdeptree.LICENSE → pipenv/vendor/pipdeptree/LICENSE b/pipenv/vendor/pipdeptree.LICENSE → pipenv/vendor/pipdeptree/LICENSE