-
Notifications
You must be signed in to change notification settings - Fork 662
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update activation scripts from virtualenv #3376
Conversation
let relative_site_packages = [ | ||
interpreter.virtualenv().purelib.as_path(), | ||
interpreter.virtualenv().platlib.as_path(), | ||
] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically need to include both, though we dedup
just below.
|
||
# add the virtual environments libraries to the host python import mechanism | ||
prev_length = len(sys.path) | ||
for lib in "{{ RELATIVE_SITE_PACKAGES }}".split(os.pathsep): | ||
path = os.path.realpath(os.path.join(bin_dir, lib)) | ||
site.addsitedir(path.decode("utf-8") if "" else path) | ||
site.addsitedir(path) | ||
sys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length] | ||
|
||
sys.real_prefix = sys.prefix |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this is what virtualenv has done for a long time, and that this script is largely vendored from virtualenv, but it's very strange to me that this script monkeypatches a variable onto the sys
module that wouldn't exist otherwise. I don't think the stdlib venv module does this, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't dug into the history deeply, but I think it's a legacy virtualenv thing, possibly from before various evolutions to the sys
module came about? We don't rely on this anywhere (though pip
and others have code to detect it). I'm inclined to just leave it as-is to avoid deviations, it doesn't really cost us anything.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. While it's still very weird to me that a script of ours would do this, I don't mind it too much given that virtualenv has been doing it since forever.
Co-authored-by: Alex Waygood <[email protected]>
Summary
Refreshes some of the activation scripts, and fixes some bugs in
activate_this.py
that were likely the rest of some erroneous copy-pasting.Closes #3346.
Test Plan