Merge pull request #4510 from Honza-m/master

Fix #4225 - virtualenv name when PIPENV_PYTHON set to filepath
This commit is contained in:
Frost Ming
2020-11-02 09:36:28 +08:00
committed by GitHub
2 changed files with 8 additions and 1 deletions
+1
View File
@@ -0,0 +1 @@
Fix a bug where setting PIPENV_PYTHON to file path breaks environment name
+7 -1
View File
@@ -443,7 +443,13 @@ class Project(object):
def virtualenv_name(self):
# type: () -> str
sanitized, encoded_hash = self._get_virtualenv_hash(self.name)
suffix = "-{0}".format(PIPENV_PYTHON) if PIPENV_PYTHON else ""
suffix = ""
if PIPENV_PYTHON:
if os.path.isabs(PIPENV_PYTHON):
suffix = "-{0}".format(os.path.basename(PIPENV_PYTHON))
else:
suffix = "-{0}".format(PIPENV_PYTHON)
# If the pipfile was located at '/home/user/MY_PROJECT/Pipfile',
# the name of its virtualenv will be 'my-project-wyUfYPqE'
return sanitized + "-" + encoded_hash + suffix