Merge branch 'master' into fix-outline-tables

news/2952.bugfix

@@ -0,0 +1 @@
+Fixed a bug with importing local vendored dependencies when running ``pipenv graph``.

news/2957.bugfix

@@ -0,0 +1 @@
+Fixed a bug which caused executable discovery to fail when running inside a virtualenv.

pipenv/core.py

@@ -105,9 +105,12 @@ def spinner():
 
 def which(command, location=None, allow_global=False):
     if not allow_global and location is None:
-        location = project.virtualenv_location or os.environ.get("VIRTUAL_ENV", "")
-    if not location and os.path.exists(location):
-        raise RuntimeError("virtualenv not created nor specified")
+        if project.virtualenv_exists:
+            location = project.virtualenv_location
+        else:
+            location = os.environ.get("VIRTUAL_ENV", None)
+    if not (location and os.path.exists(location)) and not allow_global:
+        raise RuntimeError("location not created nor specified")
     if not allow_global:
         if os.name == "nt":
             p = find_windows_executable(os.path.join(location, "Scripts"), command)
@@ -2325,6 +2328,7 @@ def do_check(
 def do_graph(bare=False, json=False, json_tree=False, reverse=False):
     import pipdeptree
 
+
     try:
         python_path = which("python")
     except AttributeError:

pipenv/vendor/pipdeptree.py

@@ -13,6 +13,8 @@
 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

@@ -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