mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-14 00:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename PythonRequest::Any -> PythonRequest::Default (#7514)

Browse source 
As we support more complex Python discovery behaviors such as:

- #7431 
- #7335 
- #7300 

`Any` is no longer accurate, we actually are looking for a reasonable
default Python version to use which may exclude the first one we find.
Separately, we need the idea of `Any` to improve behavior when listing
versions (e.g., #7286) where we do actually want to match _any_ Python
version. As a first step, we'll rename `Any` to `Default`. Then, we'll
introduce a new `Any` that actually behaves as we'd expect.
This commit is contained in:
Zanie Blue 2024-09-19 05:56:05 -05:00 • committed by GitHub
parent 209c870232
commit 5941709e55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 62 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

68
crates/uv-python/src/lib.rs
View file

@ -416,7 +416,7 @@ mod tests {
context.search_path = Some(vec![]);
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::default(),
&context.cache,
@ -430,7 +430,7 @@ mod tests {
context.search_path = None;
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::default(),
&context.cache,
@ -454,7 +454,7 @@ mod tests {
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::default(),
&context.cache,
@ -478,7 +478,7 @@ mod tests {
let interpreter = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::default(),
&context.cache,
@ -538,7 +538,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::default(),
&context.cache,
@ -569,7 +569,7 @@ mod tests {
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::default(),
&context.cache,
@ -605,7 +605,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::default(),
&context.cache,
@ -636,7 +636,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -657,7 +657,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -682,7 +682,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::OnlySystem,
&context.cache,
@ -707,7 +707,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -970,7 +970,7 @@ mod tests {
let python =
context.run_with_vars(&[("VIRTUAL_ENV", Some(venv.as_os_str()))], || {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -995,7 +995,7 @@ mod tests {
let python =
context.run_with_vars(&[("VIRTUAL_ENV", Some(venv.as_os_str()))], || {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1020,7 +1020,7 @@ mod tests {
context.run_with_vars(&[("CONDA_PREFIX", Some(condaenv.as_os_str()))], || {
// Note this python is not treated as a system interpreter
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlyVirtual,
PythonPreference::OnlySystem,
&context.cache,
@ -1050,7 +1050,7 @@ mod tests {
],
|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1069,7 +1069,7 @@ mod tests {
let python =
context.run_with_vars(&[("CONDA_PREFIX", Some(condaenv.as_os_str()))], || {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1094,7 +1094,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1111,7 +1111,7 @@ mod tests {
context.add_python_versions(&["3.12.1", "3.12.2"])?;
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1139,7 +1139,7 @@ mod tests {
let python =
context.run_with_vars(&[("VIRTUAL_ENV", Some(venv.as_os_str()))], || {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1172,7 +1172,7 @@ mod tests {
&[("UV_INTERNAL__PARENT_INTERPRETER", Some(parent.as_os_str()))],
|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1196,7 +1196,7 @@ mod tests {
],
|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1217,7 +1217,7 @@ mod tests {
],
|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::ExplicitSystem,
PythonPreference::OnlySystem,
&context.cache,
@ -1238,7 +1238,7 @@ mod tests {
],
|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::OnlySystem,
&context.cache,
@ -1259,7 +1259,7 @@ mod tests {
],
|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlyVirtual,
PythonPreference::OnlySystem,
&context.cache,
@ -1292,7 +1292,7 @@ mod tests {
&[("UV_INTERNAL__PARENT_INTERPRETER", Some(parent.as_os_str()))],
|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1319,7 +1319,7 @@ mod tests {
let python =
context.run_with_vars(&[("VIRTUAL_ENV", Some(venv.as_os_str()))], || {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlySystem,
PythonPreference::OnlySystem,
&context.cache,
@ -1371,7 +1371,7 @@ mod tests {
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::OnlyVirtual,
PythonPreference::OnlySystem,
&context.cache,
@ -1422,7 +1422,7 @@ mod tests {
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1767,7 +1767,7 @@ mod tests {
context.add_python_interpreters(&[(true, ImplementationName::PyPy, "pypy", "3.10.0")])?;
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1783,7 +1783,7 @@ mod tests {
context.add_python_interpreters(&[(true, ImplementationName::PyPy, "python", "3.10.1")])?;
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -1836,7 +1836,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -2110,7 +2110,7 @@ mod tests {
)])?;
let result = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -2131,7 +2131,7 @@ mod tests {
)])?;
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,
@ -2184,7 +2184,7 @@ mod tests {
let python = context.run(|| {
find_python_installation(
&PythonRequest::Any,
&PythonRequest::Default,
EnvironmentPreference::Any,
PythonPreference::OnlySystem,
&context.cache,