kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2975 from pypa/fix-graph-imports

Browse Source 
Fix graph import
This commit is contained in:
Dan Ryan
2018-10-09 22:30:53 -04:00
committed by GitHub
parent ddb40eca90 1f28df2ec7
commit 7ba1f65bc6
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
news/2952.bugfix
+1
View File
@@ -0,0 +1 @@
Fixed a bug with importing local vendored dependencies when running ``pipenv graph``.
pipenv/vendor/pipdeptree.py
Vendored
+2
View File
@@ -13,6 +13,8 @@ try:
except ImportError:
from ordereddict import OrderedDict
pardir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
sys.path.append(pardir)
from pipenv.vendor.pip_shims import get_installed_distributions, FrozenRequirement
import pkg_resources
tasks/vendoring/patches/vendor/pipdeptree-updated-pip18.patch
Vendored
+4 -2
View File
@@ -1,8 +1,8 @@
diff --git a/pipenv/vendor/pipdeptree.py b/pipenv/vendor/pipdeptree.py
index 7820aa5..9cce032 100644
index 7820aa5..2082fc8 100644
--- a/pipenv/vendor/pipdeptree.py
+++ b/pipenv/vendor/pipdeptree.py
@@ -13,11 +13,7 @@ try:
@@ -13,11 +13,9 @@ try:
except ImportError:
from ordereddict import OrderedDict
@@ -11,6 +11,8 @@ index 7820aa5..9cce032 100644
- from pipenv.patched.notpip._internal.operations.freeze import FrozenRequirement
-except ImportError:
- from pipenv.patched.notpip import get_installed_distributions, FrozenRequirement
+pardir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+sys.path.append(pardir)
+from pipenv.vendor.pip_shims import get_installed_distributions, FrozenRequirement
import pkg_resources