Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix interpreter discovery for tests (#3785) 

The venv subcommand requires a system interpreter. The tests python path
discovery would previously allow a venv interpreter, failing the venv
tests that don't have system interpreter anymore.

---------

Co-authored-by: Zanie Blue <contact@zanie.dev>
This commit is contained in:
konsti 2024-05-23 14:56:19 +02:00 committed by GitHub
parent 2a17309782
commit 91ed1c6c7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/uv-interpreter/src/discovery.rs
View File

@ -392,7 +392,7 @@ fn python_interpreters<'a>(
true
} else {
debug!(
"Ignoring Python interpreter at `{}`: system intepreter not explicit",
"Ignoring Python interpreter at `{}`: system interpreter not explicit",
interpreter.sys_executable().display()
);
false
@ -401,7 +401,7 @@ fn python_interpreters<'a>(
(SystemPython::Explicit, true) => true,
(SystemPython::Disallowed, false) => {
debug!(
"Ignoring Python interpreter at `{}`: system intepreter not allowed",
"Ignoring Python interpreter at `{}`: system interpreter not allowed",
interpreter.sys_executable().display()
);
false
@ -409,7 +409,7 @@ fn python_interpreters<'a>(
(SystemPython::Disallowed, true) => true,
(SystemPython::Required, true) => {
debug!(
"Ignoring Python interpreter at `{}`: system intepreter required",
"Ignoring Python interpreter at `{}`: system interpreter required",
interpreter.sys_executable().display()
);
false
@ -423,7 +423,7 @@ fn python_interpreters<'a>(
/// Check if an encountered error should stop discovery.
///
/// Returns false when an error could be due to a faulty intepreter and we should continue searching for a working one.
/// Returns false when an error could be due to a faulty interpreter and we should continue searching for a working one.
fn should_stop_discovery(err: &Error) -> bool {
match err {
// When querying the interpreter fails, we will only raise errors that demonstrate that something is broken

4
crates/uv/tests/common/mod.rs
View File

@ -403,7 +403,9 @@ pub fn python_path_with_versions(
let sources = SourceSelector::All;
if let Ok(found) = find_interpreter(
&request,
uv_interpreter::SystemPython::Allowed,
// Without required, we could pick the current venv here and the test fails
// because the venv subcommand requires a system interpreter.
uv_interpreter::SystemPython::Required,
&sources,
&cache,
)