Merge pull request #13161 from roubert/running_under_virtualenv

pypa · Feb 3, 2025 · 38e9bbe · 38e9bbe
2 parents 028c087 + 127134a
commit 38e9bbe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/news/13156.bugfix.rst b/news/13156.bugfix.rst
@@ -0,0 +1 @@
+Show the correct path to the interpreter also when it's a symlink in a venv in the pip upgrade prompt.
diff --git a/src/pip/_internal/utils/entrypoints.py b/src/pip/_internal/utils/entrypoints.py
@@ -77,7 +77,10 @@ def get_best_invocation_for_this_python() -> str:
 
     # Try to use the basename, if it's the first executable.
     found_executable = shutil.which(exe_name)
-    if found_executable and os.path.samefile(found_executable, exe):
+    # Virtual environments often symlink to their parent Python binaries, but we don't
+    # want to treat the Python binaries as equivalent when the environment's Python is
+    # not on PATH (not activated). Thus, we don't follow symlinks.
+    if found_executable and os.path.samestat(os.lstat(found_executable), os.lstat(exe)):
         return exe_name
 
     # Use the full executable name, because we couldn't find something simpler.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Show the correct path to the interpreter also when it's a symlink in a venv in the pip upgrade prompt.