Discover and prefer the parent interpreter when invoked with python -m uv
#3736
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
zanieb
changed the title
python -m uv ...python -m uv
zanieb
commented
May 22, 2024
zanieb
commented
May 22, 2024
| @@ -1053,22 +1063,16 @@ impl SourceSelector { | |||
| InterpreterSource::SearchPath, | |||
| InterpreterSource::PyLauncher, | |||
| InterpreterSource::ManagedToolchain, | |||
| InterpreterSource::ParentInterpreter, | |||
There was a problem hiding this comment.
This is in the SystemPython::Required clause. Maybe I should move it out? This may be a bit weird if you do ./.venv/bin/python -m uv pip install --system as we'll still find this Python... but also a bit weird if you do /sys/python -m uv --system and we find a different Python?
There was a problem hiding this comment.
I think I can fix this with some changes to discovery
There was a problem hiding this comment.
Is the ideal behavior that:
./.venv/bin/python -m uv pip install --systemdoes not find.venv/bin/python/sys/python -m uv --systemdoes find/sys/python
?
There was a problem hiding this comment.
I think so yea. With #3739 this will be possible
There was a problem hiding this comment.
(rebasing this onto that now)
There was a problem hiding this comment.
The behavior should be as described now, I'll do some QA.
konstin
approved these changes
May 22, 2024
python/uv/__main__.py
Outdated
| @@ -31,6 +31,9 @@ def _run() -> None: | |||
| if venv: | |||
| env.setdefault("VIRTUAL_ENV", venv) | |||
|
|
|||
| # Let `uv` know that it was spawned by this Python interpreter | |||
| env["UV__PARENT_INTERPRETER"] = sys.executable | |||
There was a problem hiding this comment.
Can we use something other than the double underscore, like a name that is so long that no one likes to use it outside that script?
There was a problem hiding this comment.
I feel like the double underscore is sufficient for saying it's not user facing and we're not going to document or support it elsewhere. Idk about making the name arbitrarily longer.... I guess I could do UV_PRIVATE__...?
zanieb
added a commit
that referenced
this pull request
May 22, 2024
Previously, we enforced `SystemPython` outside of the interpreter discovery exclusively with source selection. Now, we perform additional filtering of interpreters depending on if they are a virtual environment. This should not change any existing behavior, but will make it much easier to have consistent behavior in ambiguous cases like #3736 (comment) where a source could provide either a system interpreter or virtual environment interpreter.
zanieb
commented
May 22, 2024
Comment on lines
+65
to
69
| /// Only allow a system Python if passed directly i.e. via [`InterpreterSource::ProvidedPath`] or [`InterpreterSource::ParentInterpreter`] | ||
| #[default] | ||
| Explicit, | ||
| /// Do not allow a system Python | ||
| Disallowed, |
There was a problem hiding this comment.
I decided to add an Explicit variant to avoid confusing internal behavior where SystemPython::Disallowed could still get a system Python from this environment variable.
# Conflicts: # crates/uv-interpreter/src/discovery.rs
|
e.g. |
charliermarsh
approved these changes
May 22, 2024
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.
Closes #2222
Closes #2058
Replaces #2338
See also #2649
We use an environment variable (
UV_INTERNAL__PARENT_INTERPRETER) to track the invoking interpreter whenpython -m uvis used. The parent interpreter is preferred over all other sources (though it will be skipped if it does not meet a--pythonrequest or if--systemis used and it belongs to a virtual environment). We warn if--systemis not provided and this interpreter would mutate system packages, but allow it.