Allow identical VIRTUAL_ENV and CONDA_PREFIX env vars (#1879)

* Allow identical `VIRTUAL_ENV` and `CONDA_PREFIX` env vars Fixes #1878 * cargo fmt --------- Co-authored-by: messense <[email protected]>
PyO3 · Dec 12, 2023 · 7dfb268 · 7dfb268
1 parent 2531f33
commit 7dfb268
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -191,6 +191,7 @@ fn detect_venv(target: &Target) -> Result<PathBuf> {
     match (env::var_os("VIRTUAL_ENV"), env::var_os("CONDA_PREFIX")) {
         (Some(dir), None) => return Ok(PathBuf::from(dir)),
         (None, Some(dir)) => return Ok(PathBuf::from(dir)),
+        (Some(venv), Some(conda)) if venv == conda => return Ok(PathBuf::from(venv)),
         (Some(_), Some(_)) => {
             bail!("Both VIRTUAL_ENV and CONDA_PREFIX are set. Please unset one of them")
         }