Skip to content
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

Fix venvlauncher.exe reference in venv creation #3160

Merged
merged 2 commits into from
Apr 20, 2024
Merged

Fix venvlauncher.exe reference in venv creation #3160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9acbc39
Test launcher script behavior
charliermarsh Apr 20, 2024
5f719c3
Fix venvlauncher.exe reference in venv creation
charliermarsh Apr 20, 2024
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
6 changes: 3 additions & 3 deletions crates/uv-virtualenv/src/bare.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,20 @@ pub fn create_bare_venv(
Ok(_) => {}
Err(err) if err.kind() == io::ErrorKind::NotFound => {
let launcher = match python_exe {
"python.exe" => "venvwlauncher.exe",
"python.exe" => "venvlauncher.exe",
"pythonw.exe" => "venvwlauncher.exe",
_ => unreachable!(),
};

// If `python.exe` doesn't exist, try the `venvlaucher.exe` shim.
// If `python.exe` doesn't exist, try the `venvlauncher.exe` shim.
let shim = interpreter
.stdlib()
.join("venv")
.join("scripts")
.join("nt")
.join(launcher);

// If the `venvwlauncher.exe` shim doesn't exist, then on Conda at least, we
// If the `venvlauncher.exe` shim doesn't exist, then on Conda at least, we
// can look for it next to the Python executable itself.
match fs_err::copy(shim, scripts.join(python_exe)) {
Ok(_) => {}
Expand Down
Loading