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

Use PythonEnvironment API in uv pip compile (#4030)

Browse source 
Same as https://github.com/astral-sh/uv/pull/4029
This commit is contained in:
Zanie Blue 2024-06-06 19:54:40 -04:00 • committed by GitHub
parent cc7c780523
commit cb7d6245ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/uv/src/commands/pip/compile.rs
View file

@ -31,11 +31,10 @@ use uv_dispatch::BuildDispatch;
use uv_distribution::DistributionDatabase; use uv_distribution::DistributionDatabase;
use uv_fs::Simplified; use uv_fs::Simplified;
use uv_git::GitResolver; use uv_git::GitResolver;
use uv_interpreter::PythonVersion;
use uv_interpreter::{ use uv_interpreter::{
find_best_interpreter, find_interpreter, InterpreterRequest, PythonEnvironment, SystemPython, find_best_interpreter, InterpreterRequest, PythonEnvironment, SystemPython, VersionRequest,
VersionRequest,
}; };
use uv_interpreter::{PythonVersion, SourceSelector};
use uv_normalize::{ExtraName, PackageName}; use uv_normalize::{ExtraName, PackageName};
use uv_requirements::{ use uv_requirements::{
upgrade::read_requirements_txt, LookaheadResolver, NamedRequirementsResolver, upgrade::read_requirements_txt, LookaheadResolver, NamedRequirementsResolver,
@ -163,9 +162,8 @@ pub(crate) async fn pip_compile(
SystemPython::Allowed SystemPython::Allowed
}; };
let interpreter = if let Some(python) = python.as_ref() { let interpreter = if let Some(python) = python.as_ref() {
let request = InterpreterRequest::parse(python); PythonEnvironment::from_requested_python(python, system, preview, &cache)?
let sources = SourceSelector::from_settings(system, preview); .into_interpreter()
find_interpreter(&request, system, &sources, &cache)??
} else { } else {
let request = if let Some(version) = python_version.as_ref() { let request = if let Some(version) = python_version.as_ref() {
// TODO(zanieb): We should consolidate `VersionRequest` and `PythonVersion` // TODO(zanieb): We should consolidate `VersionRequest` and `PythonVersion`
@ -173,9 +171,8 @@ pub(crate) async fn pip_compile(
} else { } else {
InterpreterRequest::default() InterpreterRequest::default()
}; };
find_best_interpreter(&request, system, preview, &cache)?? find_best_interpreter(&request, system, preview, &cache)??.into_interpreter()
} };
.into_interpreter();
debug!( debug!(
"Using Python {} interpreter at {} for builds", "Using Python {} interpreter at {} for builds",