Skip to content

Fix relocatable nushell activation script #17036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zanieb merged 3 commits into from
Dec 9, 2025
Merged

Fix relocatable nushell activation script #17036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b466770
Fix relocatable nushell activation script
yumeminami Dec 8, 2025
52fe0bb
clippy
yumeminami Dec 8, 2025
1df1e97
clippy test file
yumeminami Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/uv-virtualenv/src/activator/activate.nu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export-env {
}
}

let virtual_env = '{{ VIRTUAL_ENV_DIR }}'
let virtual_env = {{ VIRTUAL_ENV_DIR }}
Copy link
Contributor

@cthoyt cthoyt Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't the quotes be important in case there are spaces in the file path?

Copy link
Contributor

@EliteTK EliteTK Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's handled in https://github.com/astral-sh/uv/pull/17036/changes#diff-1b2c87e330cac104d820ffaf2b35067c7bcf36cc5acd14767ab2007f25866619R469

let bin = '{{ BIN_NAME }}'
let path_name = if (has-env 'Path') { 'Path' } else { 'PATH' }
let venv_path = ([$virtual_env $bin] | path join)
Expand Down
9 changes: 8 additions & 1 deletion crates/uv-virtualenv/src/virtualenv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,15 @@ pub(crate) fn create(
(true, "activate.fish") => {
r#"'"$(dirname -- "$(cd "$(dirname -- "$(status -f)")"; and pwd)")"'"#.to_string()
}
(true, "activate.nu") => r#"(path self | path dirname | path dirname)"#.to_string(),
(false, "activate.nu") => {
format!(
"'{}'",
escape_posix_for_single_quotes(location.simplified().to_str().unwrap())
)
}
// Note:
// * relocatable activate scripts appear not to be possible in csh and nu shell
// * relocatable activate scripts appear not to be possible in csh.
// * `activate.ps1` is already relocatable by default.
_ => escape_posix_for_single_quotes(location.simplified().to_str().unwrap()),
};
Expand Down
6 changes: 6 additions & 0 deletions crates/uv/tests/it/venv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,12 @@ fn verify_pyvenv_cfg_relocatable() {
let activate_fish = scripts.child("activate.fish");
activate_fish.assert(predicates::path::is_file());
activate_fish.assert(predicates::str::contains(r#"set -gx VIRTUAL_ENV ''"$(dirname -- "$(cd "$(dirname -- "$(status -f)")"; and pwd)")"''"#));

let activate_nu = scripts.child("activate.nu");
activate_nu.assert(predicates::path::is_file());
activate_nu.assert(predicates::str::contains(
r#"let virtual_env = (path self | path dirname | path dirname)"#,
));
}

/// Ensure that a nested virtual environment uses the same `home` directory as the parent.
Expand Down
Loading