Allow identical VIRTUAL_ENV and CONDA_PREFIX env vars

Port of PyO3/maturin#1879 for PyO3/maturin#1878
astral-sh · Dec 18, 2023 · 3eedfc8 · 3eedfc8
1 parent 77c6e6f
commit 3eedfc8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/crates/puffin-interpreter/src/virtual_env.rs b/crates/puffin-interpreter/src/virtual_env.rs
@@ -121,6 +121,7 @@ pub(crate) fn detect_virtual_env(target: &PythonPlatform) -> Result<Option<PathB
             );
             return Ok(Some(PathBuf::from(dir)));
         }
+        (Some(venv), Some(conda)) if venv == conda => return Ok(Some(PathBuf::from(venv))),
         (Some(_), Some(_)) => {
             return Err(Error::Conflict);
         }