Allow identical VIRTUAL_ENV and CONDA_PREFIX env vars (#681)
Port of https://github.com/PyO3/maturin/pull/1879 for https://github.com/PyO3/maturin/issues/1878
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user