Skip to content

Commit

Permalink
Detect current venv when uv is invoked from within a virtualenv (#3379
Browse files Browse the repository at this point in the history
)

Fixes #3378.
  • Loading branch information
gotcha authored May 5, 2024
1 parent 6d73db2 commit ef92c38
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion crates/uv-interpreter/src/virtualenv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,14 @@ pub(crate) fn virtualenv_from_env() -> Option<PathBuf> {

/// Locate a virtual environment by searching the file system.
///
/// 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> {
let current_dir = env::current_dir().expect("Failed to detect current directory");

for dir in current_dir.ancestors() {
// Search for a `.venv` directory.
let dot_venv = dir.join(".venv");
if dot_venv.is_dir() {
if !dot_venv.join("pyvenv.cfg").is_file() {
Expand All @@ -85,6 +89,12 @@ pub(crate) fn virtualenv_from_working_dir() -> Result<Option<PathBuf>, Error> {
debug!("Found a virtualenv named .venv at: {}", dot_venv.display());
return Ok(Some(dot_venv));
}

// Otherwise, if we're _within_ a virtualenv, return it.
if dir.join("pyvenv.cfg").is_file() {
debug!("Found a virtualenv at: {}", dir.display());
return Ok(Some(dir.to_path_buf()));
}
}

Ok(None)
Expand Down

0 comments on commit ef92c38

Please sign in to comment.