Need to be able to get venv path before creating

pipenv/core.py

@@ -902,9 +902,9 @@ def do_create_virtualenv(python=None, site_packages=False, pypi_mirror=None):
         sys.executable,
         "-m",
         "virtualenv",
-        project.virtualenv_location,
         "--prompt=({0})".format(project.name),
         "--python={0}".format(python),
+        project.get_location_for_virtualenv(),
     ]
 
     # Pass site-packages flag to virtualenv, if desired…

pipenv/project.py

@@ -237,12 +237,10 @@ def virtualenv_exists(self):
 
         return False
 
-    @classmethod
-    def _get_virtualenv_location(cls, name):
-        venv = get_workon_home() / name
-        if not venv.exists():
-            return ""
-        return "{0}".format(venv)
+    def get_location_for_virtualenv(self):
+        if PIPENV_VENV_IN_PROJECT:
+            return os.path.join(self.project_directory, ".venv")
+        return str(get_workon_home().joinpath(self.virtualenv_name))
 
     @classmethod
     def _sanitize(cls, name):
@@ -316,19 +314,10 @@ def virtualenv_location(self):
             return PIPENV_VIRTUALENV
 
         # Use cached version, if available.
-        if self._virtualenv_location:
-            return self._virtualenv_location
-
-        assert self.project_directory, "project not created"
-
-        # Default mode.
-        if not self.is_venv_in_project():
-            loc = self._get_virtualenv_location(self.virtualenv_name)
-        # The user wants the virtualenv in the project.
-        else:
-            loc = os.path.join(self.project_directory, ".venv")
-        self._virtualenv_location = loc
-        return loc
+        if not self._virtualenv_location:
+            assert self.project_directory, "project not created"
+            self._virtualenv_location = self.get_location_for_virtualenv()
+        return self._virtualenv_location
 
     @property
     def virtualenv_src_location(self):