python: Add recognition of worktree -> venv links (#26759)
Python envs created with virtualenvwrapper have the ability to link to the project directory (via the `.project` file in the virtualenv). `python-environment-tools` supports this and reports the project path. Additionally, some tools (e.g virtualfish) recognize special "environment activation" files in project directories (`.venv` by default) [1]. Use the above information to sort reported Python toolchains so that the correct env for a given worktree is at the top. [1] https://virtualfish.readthedocs.io/en/latest/plugins.html#auto-activation-auto-activation Release Notes: - python: Improved detection of virtualenvwrapper environments in work trees
This commit is contained in:
parent
ada8b0f822
commit
ac5a2b2122
1 changed files with 76 additions and 23 deletions
|
@ -30,6 +30,8 @@ use std::{
|
||||||
borrow::Cow,
|
borrow::Cow,
|
||||||
ffi::OsString,
|
ffi::OsString,
|
||||||
fmt::Write,
|
fmt::Write,
|
||||||
|
fs,
|
||||||
|
io::{self, BufRead},
|
||||||
path::{Path, PathBuf},
|
path::{Path, PathBuf},
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
};
|
};
|
||||||
|
@ -635,6 +637,7 @@ static ENV_PRIORITY_LIST: &'static [PythonEnvironmentKind] = &[
|
||||||
PythonEnvironmentKind::VirtualEnvWrapper,
|
PythonEnvironmentKind::VirtualEnvWrapper,
|
||||||
PythonEnvironmentKind::Venv,
|
PythonEnvironmentKind::Venv,
|
||||||
PythonEnvironmentKind::VirtualEnv,
|
PythonEnvironmentKind::VirtualEnv,
|
||||||
|
PythonEnvironmentKind::PyenvVirtualEnv,
|
||||||
PythonEnvironmentKind::Pixi,
|
PythonEnvironmentKind::Pixi,
|
||||||
PythonEnvironmentKind::Conda,
|
PythonEnvironmentKind::Conda,
|
||||||
PythonEnvironmentKind::Pyenv,
|
PythonEnvironmentKind::Pyenv,
|
||||||
|
@ -654,6 +657,19 @@ fn env_priority(kind: Option<PythonEnvironmentKind>) -> usize {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Return the name of environment declared in <worktree-root/.venv.
|
||||||
|
///
|
||||||
|
/// https://virtualfish.readthedocs.io/en/latest/plugins.html#auto-activation-auto-activation
|
||||||
|
fn get_worktree_venv_declaration(worktree_root: &Path) -> Option<String> {
|
||||||
|
fs::File::open(worktree_root.join(".venv"))
|
||||||
|
.and_then(|file| {
|
||||||
|
let mut venv_name = String::new();
|
||||||
|
io::BufReader::new(file).read_line(&mut venv_name)?;
|
||||||
|
Ok(venv_name.trim().to_string())
|
||||||
|
})
|
||||||
|
.ok()
|
||||||
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ToolchainLister for PythonToolchainProvider {
|
impl ToolchainLister for PythonToolchainProvider {
|
||||||
async fn list(
|
async fn list(
|
||||||
|
@ -669,7 +685,7 @@ impl ToolchainLister for PythonToolchainProvider {
|
||||||
&environment,
|
&environment,
|
||||||
);
|
);
|
||||||
let mut config = Configuration::default();
|
let mut config = Configuration::default();
|
||||||
config.workspace_directories = Some(vec![worktree_root]);
|
config.workspace_directories = Some(vec![worktree_root.clone()]);
|
||||||
for locator in locators.iter() {
|
for locator in locators.iter() {
|
||||||
locator.configure(&config);
|
locator.configure(&config);
|
||||||
}
|
}
|
||||||
|
@ -683,29 +699,66 @@ impl ToolchainLister for PythonToolchainProvider {
|
||||||
.ok()
|
.ok()
|
||||||
.map_or(Vec::new(), |mut guard| std::mem::take(&mut guard));
|
.map_or(Vec::new(), |mut guard| std::mem::take(&mut guard));
|
||||||
|
|
||||||
|
let wr = worktree_root;
|
||||||
|
let wr_venv = get_worktree_venv_declaration(&wr);
|
||||||
|
// Sort detected environments by:
|
||||||
|
// environment name matching activation file (<workdir>/.venv)
|
||||||
|
// environment project dir matching worktree_root
|
||||||
|
// general env priority
|
||||||
|
// environment path matching the CONDA_PREFIX env var
|
||||||
|
// executable path
|
||||||
toolchains.sort_by(|lhs, rhs| {
|
toolchains.sort_by(|lhs, rhs| {
|
||||||
env_priority(lhs.kind)
|
// Compare venv names against worktree .venv file
|
||||||
.cmp(&env_priority(rhs.kind))
|
let venv_ordering =
|
||||||
.then_with(|| {
|
wr_venv
|
||||||
if lhs.kind == Some(PythonEnvironmentKind::Conda) {
|
.as_ref()
|
||||||
environment
|
.map_or(Ordering::Equal, |venv| match (&lhs.name, &rhs.name) {
|
||||||
.get_env_var("CONDA_PREFIX".to_string())
|
(Some(l), Some(r)) => (r == venv).cmp(&(l == venv)),
|
||||||
.map(|conda_prefix| {
|
(Some(l), None) if l == venv => Ordering::Less,
|
||||||
let is_match = |exe: &Option<PathBuf>| {
|
(None, Some(r)) if r == venv => Ordering::Greater,
|
||||||
exe.as_ref().map_or(false, |e| e.starts_with(&conda_prefix))
|
_ => Ordering::Equal,
|
||||||
};
|
});
|
||||||
match (is_match(&lhs.executable), is_match(&rhs.executable)) {
|
|
||||||
(true, false) => Ordering::Less,
|
// Compare project paths against worktree root
|
||||||
(false, true) => Ordering::Greater,
|
let proj_ordering = || match (&lhs.project, &rhs.project) {
|
||||||
_ => Ordering::Equal,
|
(Some(l), Some(r)) => (r == &wr).cmp(&(l == &wr)),
|
||||||
}
|
(Some(l), None) if l == &wr => Ordering::Less,
|
||||||
})
|
(None, Some(r)) if r == &wr => Ordering::Greater,
|
||||||
.unwrap_or(Ordering::Equal)
|
_ => Ordering::Equal,
|
||||||
} else {
|
};
|
||||||
Ordering::Equal
|
|
||||||
}
|
// Compare environment priorities
|
||||||
})
|
let priority_ordering = || env_priority(lhs.kind).cmp(&env_priority(rhs.kind));
|
||||||
.then_with(|| lhs.executable.cmp(&rhs.executable))
|
|
||||||
|
// Compare conda prefixes
|
||||||
|
let conda_ordering = || {
|
||||||
|
if lhs.kind == Some(PythonEnvironmentKind::Conda) {
|
||||||
|
environment
|
||||||
|
.get_env_var("CONDA_PREFIX".to_string())
|
||||||
|
.map(|conda_prefix| {
|
||||||
|
let is_match = |exe: &Option<PathBuf>| {
|
||||||
|
exe.as_ref().map_or(false, |e| e.starts_with(&conda_prefix))
|
||||||
|
};
|
||||||
|
match (is_match(&lhs.executable), is_match(&rhs.executable)) {
|
||||||
|
(true, false) => Ordering::Less,
|
||||||
|
(false, true) => Ordering::Greater,
|
||||||
|
_ => Ordering::Equal,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.unwrap_or(Ordering::Equal)
|
||||||
|
} else {
|
||||||
|
Ordering::Equal
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Compare Python executables
|
||||||
|
let exe_ordering = || lhs.executable.cmp(&rhs.executable);
|
||||||
|
|
||||||
|
venv_ordering
|
||||||
|
.then_with(proj_ordering)
|
||||||
|
.then_with(priority_ordering)
|
||||||
|
.then_with(conda_ordering)
|
||||||
|
.then_with(exe_ordering)
|
||||||
});
|
});
|
||||||
|
|
||||||
let mut toolchains: Vec<_> = toolchains
|
let mut toolchains: Vec<_> = toolchains
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue