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

Refactor project interpreter request for `requires-python` specifiers (#4216) 

Refactor following #4214 to avoid parsing the specifiers again
This commit is contained in:
Zanie Blue 2024-06-10 21:32:40 -04:00 committed by GitHub
parent 68abf85f0d
commit f296ef08d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/uv/src/commands/project/mod.rs
View File

@ -21,7 +21,7 @@ use uv_git::GitResolver;
use uv_installer::{SatisfiesResult, SitePackages};
use uv_requirements::{RequirementsSource, RequirementsSpecification};
use uv_resolver::{FlatIndex, InMemoryIndex, Options, RequiresPython};
use uv_toolchain::{PythonEnvironment, SystemPython, Toolchain, ToolchainRequest};
use uv_toolchain::{PythonEnvironment, SystemPython, Toolchain, ToolchainRequest, VersionRequest};
use uv_types::{BuildIsolation, HashStrategy, InFlight};
use uv_warnings::warn_user;
@ -125,15 +125,25 @@ pub(crate) fn init_environment(
Err(e) => return Err(e.into()),
}
// TODO(konsti): Extend `VersionRequest` to support `VersionSpecifiers`.
let requires_python_str = requires_python.map(ToString::to_string);
let interpreter = Toolchain::find(
python.or(requires_python_str.as_deref()),
// Otherwise we'll try to use the venv we just deleted.
SystemPython::Required,
preview,
cache,
)?
let interpreter = if let Some(request) = python.map(ToolchainRequest::parse).or(requires_python
.map(|specifiers| ToolchainRequest::Version(VersionRequest::Range(specifiers.clone()))))
{
Toolchain::find_requested(
&request,
// Otherwise we'll try to use the venv we just deleted.
SystemPython::Required,
preview,
cache,
)
} else {
Toolchain::find(
None,
// Otherwise we'll try to use the venv we just deleted.
SystemPython::Required,
preview,
cache,
)
}?
.into_interpreter();
if let Some(requires_python) = requires_python {