mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-09-30 05:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Re-add support for pyenv shims (#2503)

Browse source 
## Summary

By running `get_interpreter_info.py` outside of the current working
directory, we seem to have broken pyenv shims.

Closes https://github.com/astral-sh/uv/issues/2488.

## Test Plan

Without this change (resolving to the Homebrew Python, even though we
start with a shim):

```
DEBUG Starting interpreter discovery for Python @ `python3.11`
DEBUG Probing interpreter info for: /Users/crmarsh/.pyenv/shims/python3.11
DEBUG Found Python 3.11.7 for: /Users/crmarsh/.pyenv/shims/python3.11
Using Python 3.11.7 interpreter at: /opt/homebrew/opt/python@3.11/bin/python3.11
Creating virtualenv at: .venv
INFO Removing existing directory
Activate with: source .venv/bin/activate
```

With this change:

```
DEBUG Starting interpreter discovery for Python @ `python3.11`
DEBUG Probing interpreter info for: /Users/crmarsh/.pyenv/shims/python3.11
DEBUG Found Python 3.11.1 for: /Users/crmarsh/.pyenv/shims/python3.11
Using Python 3.11.1 interpreter at: /Users/crmarsh/.pyenv/versions/3.11.1/bin/python3.11
Creating virtualenv at: .venv
INFO Removing existing directory
Activate with: source .venv/bin/activate
```
This commit is contained in:
Charlie Marsh 2024-03-17 19:57:36 -07:00 • committed by GitHub
parent 653327b55d
commit a07438f52f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/uv-interpreter/src/interpreter.rs
View file

@ -372,7 +372,8 @@ impl InterpreterInfo {
let output = Command::new(interpreter) let output = Command::new(interpreter)
.arg("-m") .arg("-m")
.arg("python.get_interpreter_info") .arg("python.get_interpreter_info")
.current_dir(tempdir.path().simplified()) .env("PYTHONPATH", tempdir.path())
.env("PYTHONSAFEPATH", "1")
.output() .output()
.map_err(|err| Error::PythonSubcommandLaunch { .map_err(|err| Error::PythonSubcommandLaunch {
interpreter: interpreter.to_path_buf(), interpreter: interpreter.to_path_buf(),