Detect current venv when uv is invoked from within a virtualenv
#3379
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
charliermarsh
approved these changes
May 5, 2024
|
Thanks, this looks reasonable to me. |
charliermarsh
changed the title
uv is invoked from within a virtualenv
gotcha
commented
May 6, 2024
| /// Finds a `.venv` directory in the current or any parent directory. | ||
| /// Checks if the working directory is a virtual environment. | ||
| /// | ||
| /// If not, finds a `.venv` directory in the current or any parent directory. | ||
| pub(crate) fn virtualenv_from_working_dir() -> Result<Option<PathBuf>, Error> { |
There was a problem hiding this comment.
Thanks for merging !
The comment is not in line with the strategy.
Should I make a PR or let you fix it ?
| if dir.join("pyvenv.cfg").is_file() { | ||
| debug!("Found a virtualenv at: {}", dir.display()); | ||
| return Ok(Some(dir.to_path_buf())); | ||
| } | ||
| } |
There was a problem hiding this comment.
What is the reasoning behind moving the check for pyvenv.cfg before search for .venv to after the search ?
There was a problem hiding this comment.
The main thing I wanted to change here was looking in ancestor directories, so that if you're in .venv/bin, we still find the current venv. Whether this check comes before or after the // Search for a .venv directory. step is somewhat less clear, that's a weird situation (you have a nested venv within a venv).
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.
Fixes #3378
Does this still demands a test ?