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

Reduce uv-toolchain discovery API to Toolchain (#4148)

Browse source 
Drops `find_toolchain`, `find_best_toolchain`, etc. in favor of
`Toolchain::find_...`

We can change this in the future, but there should only be one "right"
way to do it not two redundant ways in the public interface.
This commit is contained in:
Zanie Blue 2024-06-07 17:56:25 -04:00 • committed by GitHub
parent 365bcfce1a
commit 13f03e9d3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/uv-toolchain/src/discovery.rs
View file

@ -445,7 +445,7 @@ fn should_stop_discovery(err: &Error) -> bool {
/// ///
/// If an error is encountered while locating or inspecting a candidate toolchain, /// If an error is encountered while locating or inspecting a candidate toolchain,
/// the error will raised instead of attempting further candidates. /// the error will raised instead of attempting further candidates.
pub fn find_toolchain( pub(crate) fn find_toolchain(
request: &ToolchainRequest, request: &ToolchainRequest,
system: SystemPython, system: SystemPython,
sources: &ToolchainSources, sources: &ToolchainSources,
@ -627,7 +627,7 @@ pub fn find_toolchain(
/// Virtual environments are not included in discovery. /// Virtual environments are not included in discovery.
/// ///
/// See [`find_toolchain`] for more details on toolchain discovery. /// See [`find_toolchain`] for more details on toolchain discovery.
pub fn find_default_toolchain( pub(crate) fn find_default_toolchain(
preview: PreviewMode, preview: PreviewMode,
cache: &Cache, cache: &Cache,
) -> Result<ToolchainResult, Error> { ) -> Result<ToolchainResult, Error> {

9
crates/uv-toolchain/src/lib.rs
View file

@ -2,9 +2,8 @@
use thiserror::Error; use thiserror::Error;
pub use crate::discovery::{ pub use crate::discovery::{
find_best_toolchain, find_default_toolchain, find_toolchain, Error as DiscoveryError, Error as DiscoveryError, SystemPython, ToolchainNotFound, ToolchainRequest, ToolchainSource,
SystemPython, ToolchainNotFound, ToolchainRequest, ToolchainSource, ToolchainSources, ToolchainSources, VersionRequest,
VersionRequest,
}; };
pub use crate::environment::PythonEnvironment; pub use crate::environment::PythonEnvironment;
pub use crate::interpreter::Interpreter; pub use crate::interpreter::Interpreter;
@ -81,9 +80,9 @@ mod tests {
use uv_cache::Cache; use uv_cache::Cache;
use uv_configuration::PreviewMode; use uv_configuration::PreviewMode;
use crate::discovery::{find_default_toolchain, find_toolchain};
use crate::{ use crate::{
find_default_toolchain, find_toolchain, implementation::ImplementationName, implementation::ImplementationName, managed::InstalledToolchains, toolchain::Toolchain,
managed::InstalledToolchains, toolchain::Toolchain,
virtualenv::virtualenv_python_executable, Error, PythonVersion, SystemPython, virtualenv::virtualenv_python_executable, Error, PythonVersion, SystemPython,
ToolchainNotFound, ToolchainRequest, ToolchainSource, ToolchainSources, VersionRequest, ToolchainNotFound, ToolchainRequest, ToolchainSource, ToolchainSources, VersionRequest,
}; };

8
crates/uv-toolchain/src/toolchain.rs
View file

@ -2,11 +2,11 @@ use uv_configuration::PreviewMode;
use uv_cache::Cache; use uv_cache::Cache;
use crate::discovery::{SystemPython, ToolchainRequest, ToolchainSources}; use crate::discovery::{
use crate::{ find_best_toolchain, find_default_toolchain, find_toolchain, SystemPython, ToolchainRequest,
find_best_toolchain, find_default_toolchain, find_toolchain, Error, Interpreter, ToolchainSources,
ToolchainSource,
}; };
use crate::{Error, Interpreter, ToolchainSource};
/// A Python interpreter and accompanying tools. /// A Python interpreter and accompanying tools.
#[derive(Clone, Debug)] #[derive(Clone, Debug)]

21
crates/uv/tests/common/mod.rs
View file

@ -18,9 +18,7 @@ use uv_configuration::PreviewMode;
use uv_cache::Cache; use uv_cache::Cache;
use uv_fs::Simplified; use uv_fs::Simplified;
use uv_toolchain::managed::InstalledToolchains; use uv_toolchain::managed::InstalledToolchains;
use uv_toolchain::{ use uv_toolchain::{PythonVersion, Toolchain};
find_toolchain, PythonVersion, ToolchainRequest, ToolchainSources, VersionRequest,
};
// Exclude any packages uploaded after this date. // Exclude any packages uploaded after this date.
pub static EXCLUDE_NEWER: &str = "2024-03-25T00:00:00Z"; pub static EXCLUDE_NEWER: &str = "2024-03-25T00:00:00Z";
@ -476,22 +474,15 @@ pub fn python_path_with_versions(
.unwrap_or_default(); .unwrap_or_default();
if inner.is_empty() { if inner.is_empty() {
// Fallback to a system lookup if we failed to find one in the toolchain directory // Fallback to a system lookup if we failed to find one in the toolchain directory
let request = ToolchainRequest::Version( if let Ok(toolchain) = Toolchain::find(
VersionRequest::from_str(python_version) Some(python_version),
.expect("The test version request must be valid"),
);
let sources = ToolchainSources::All(PreviewMode::Enabled);
if let Ok(found) = find_toolchain(
&request,
// Without required, we could pick the current venv here and the test fails // Without required, we could pick the current venv here and the test fails
// because the venv subcommand requires a system interpreter. // because the venv subcommand requires a system interpreter.
uv_toolchain::SystemPython::Required, uv_toolchain::SystemPython::Required,
&sources, PreviewMode::Enabled,
&cache, &cache,
) ) {
.unwrap() vec![toolchain
{
vec![found
.into_interpreter() .into_interpreter()
.sys_executable() .sys_executable()
.parent() .parent()