Merge pull request #4510 from Honza-m/master

Fix #4225 - virtualenv name when PIPENV_PYTHON set to filepath
pypa · Nov 2, 2020 · 20ed424 · 20ed424
2 parents 912164d + 8d84e6e
commit 20ed424
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/news/4225.bugfix.rst b/news/4225.bugfix.rst
@@ -0,0 +1 @@
+Fix a bug where setting PIPENV_PYTHON to file path breaks environment name
diff --git a/pipenv/project.py b/pipenv/project.py
@@ -443,7 +443,13 @@ def get_name(name, location):
  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