Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Consistent use of
BIN_NAME
in activation scripts (#1577)
This PR fixes the bug where the `BIN_NAME` replacement field wasn't being used in the activator scripts. fixes: #1518 ## Test plan As I don't have a Windows machine, I switched the `bin_name` value here to point to `Scripts` on `unix` platform: https://github.com/astral-sh/uv/blob/2a76c5908416b1e4c565349c86bc41a01515c8bf/crates/gourgeist/src/bare.rs#L99-L105 <details><summary>Code diff</summary> <p> ```diff ```diff diff --git a/crates/gourgeist/src/bare.rs b/crates/gourgeist/src/bare.rs index 4c7808d3..0e0b41cf 100644 --- a/crates/gourgeist/src/bare.rs +++ b/crates/gourgeist/src/bare.rs @@ -97,9 +97,9 @@ pub fn create_bare_venv(location: &Utf8Path, interpreter: &Interpreter) -> io::R // TODO(konstin): I bet on windows we'll have to strip the prefix again let location = location.canonicalize_utf8()?; let bin_name = if cfg!(unix) { - "bin" - } else if cfg!(windows) { "Scripts" + } else if cfg!(windows) { + "bin" } else { unimplemented!("Only Windows and Unix are supported") }; ``` </p> </details> I then created the virtual environment as usual and tested out that the path modifications were correct: ```console $ cargo run --bin uv -- venv Finished dev [unoptimized + debuginfo] target(s) in 0.13s Running `target/debug/uv venv` Using Python 3.12.1 interpreter at /Users/dhruv/.pyenv/versions/3.12.1/bin/python3.12 Creating virtualenv at: .venv $ source .venv/Scripts/activate $ echo $PATH /Users/dhruv/work/astral/uv/.venv/Scripts:[...] $ which python /Users/dhruv/work/astral/uv/.venv/Scripts/python ``` I'm not sure how else to test this without having access to a Windows machine
- Loading branch information