Make better prediction of the virtualenv site-packages version #12752
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Try to make prediction of the Python's site-package version used by virtualenv. If predicted path doesn't exist, continue with previous behaviour. This can be useful while working with different Python versions in virtual environments other than system-used (previously provided via `sys.version_info`). Note that this *only* updates $PYTHONPATH, so 3rd-libraries installed in virtualenv will be avialable. However the Python interpreter contiunues to be other than the bundled in the virtualenv (see `init_virtualenv()` docstring).
|
This is interesting fix at 62e6c27. This bug also existed in the current diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1770b4f67..ded20f975 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -932,7 +932,7 @@ def init_virtualenv(self):
return
if sys.platform == "win32":
- virtual_env = Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages")
+ virtual_env = str(Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages"))
else:
venv_path_prefix = Path(os.environ["VIRTUAL_ENV"], "lib")
venv_path_suffix = Path("site-packages")On the other hand, AppVeyor build passes. Strange. I don't have access to Windows to test it myself. |
|
OK. The PR is ready to review. I can also add a commit proposed in the #12752 (comment) Let me know what do you think. Thanks. |
|
Thanks, and apologies for the delay. This looks good to me and I'll trust you a s virtualenv user. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR improves virtualenv integration.
Current implementation assumes that the Python used in virtualenv is in the same version as the Python that is being used to run IPython. This is definitely not truth in most cases. In fact, one of the purpose of using virtualenv is to run different Python's interpreter versions. So the assumption is in opposite of the one of principal goals of the virtualenv idea.
This PR predicts a proper path to the virtualenv's libraries by looking-up at
$VIRTUAL_ENVenvironmental variable againstpythonX.YorpyX.Ysubstrings. The$VIRTUAL_ENVusually contains Python's version in the name, e.g.project-name-py3.7,project-name-py3.8. If predicted path doesn't exist, the previous functionality is proceed.Example:
Results:
$VIRTUAL_ENV/lib/python3.9/site-packages$VIRTUAL_ENV/lib/python3.7/site/packages