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

Expose `toolchain-preference` as a CLI and configuration file option (#4424) 

Exposes the option added in #4416. Adds `--toolchain-preference` and
`tool.uv.toolchain-preference` to configure if system or managed
toolchains are preferred. Users can opt-out of managed toolchains or
system toolchains entirely as well.
This commit is contained in:
Zanie Blue 2024-06-20 14:42:09 -04:00 committed by GitHub
parent e797d3eb5c
commit 93c6e0df56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 178 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -4984,6 +4984,7 @@ dependencies = [
"anyhow",
"assert_fs",
"cache-key",
"clap",
"configparser",
"fs-err",
"futures",

3
crates/uv-settings/src/combine.rs
View File

@ -5,7 +5,7 @@ use distribution_types::IndexUrl;
use install_wheel_rs::linker::LinkMode;
use uv_configuration::{ConfigSettings, IndexStrategy, KeyringProviderType, TargetTriple};
use uv_resolver::{AnnotationStyle, ExcludeNewer, PreReleaseMode, ResolutionMode};
use uv_toolchain::PythonVersion;
use uv_toolchain::{PythonVersion, ToolchainPreference};
use crate::{FilesystemOptions, PipOptions};
@ -69,6 +69,7 @@ impl_combine_or!(PythonVersion);
impl_combine_or!(ResolutionMode);
impl_combine_or!(String);
impl_combine_or!(TargetTriple);
impl_combine_or!(ToolchainPreference);
impl_combine_or!(bool);
impl<T> Combine for Option<Vec<T>> {

3
crates/uv-settings/src/settings.rs
View File

@ -11,7 +11,7 @@ use uv_configuration::{
use uv_macros::CombineOptions;
use uv_normalize::{ExtraName, PackageName};
use uv_resolver::{AnnotationStyle, ExcludeNewer, PreReleaseMode, ResolutionMode};
use uv_toolchain::PythonVersion;
use uv_toolchain::{PythonVersion, ToolchainPreference};
/// A `pyproject.toml` with an (optional) `[tool.uv]` section.
#[allow(dead_code)]
@ -59,6 +59,7 @@ pub struct GlobalOptions {
pub no_cache: Option<bool>,
pub cache_dir: Option<PathBuf>,
pub preview: Option<bool>,
pub toolchain_preference: Option<ToolchainPreference>,
}
/// Settings relevant to all installer operations.

1
crates/uv-toolchain/Cargo.toml
View File

@ -28,6 +28,7 @@ uv-state = { workspace = true }
uv-warnings = { workspace = true }
anyhow = { workspace = true }
clap = { workspace = true, optional = true }
configparser = { workspace = true }
fs-err = { workspace = true, features = ["tokio"] }
itertools = { workspace = true }

11
crates/uv-toolchain/src/discovery.rs
View File

@ -51,12 +51,15 @@ pub enum ToolchainRequest {
/// Generally these refer to uv-managed toolchain downloads.
Key(PythonDownloadRequest),
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, serde::Deserialize)]
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
#[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum ToolchainPreference {
/// Only use managed interpreters, never use system interpreters.
OnlyManaged,
/// Prefer installed managed interpreters, but use system interpreters if not found.
/// If neither can be found, download a managed interpreter.
#[default]
PreferInstalledManaged,
/// Prefer managed interpreters, even if one needs to be downloaded, but use system interpreters if found.
@ -1177,8 +1180,8 @@ impl ToolchainPreference {
}
}
/// Return a [`ToolchainPreference`] based the given settings.
pub fn from_settings(preview: PreviewMode) -> Self {
/// Return a default [`ToolchainPreference`] based on the environment and preview mode.
pub fn default_from(preview: PreviewMode) -> Self {
if env::var_os("UV_TEST_PYTHON_PATH").is_some() {
debug!("Only considering system interpreters due to `UV_TEST_PYTHON_PATH`");
Self::OnlySystem

2
crates/uv/Cargo.toml
View File

@ -33,7 +33,7 @@ uv-normalize = { workspace = true }
uv-requirements = { workspace = true }
uv-resolver = { workspace = true, features = ["clap"] }
uv-settings = { workspace = true, features = ["schemars"] }
uv-toolchain = { workspace = true }
uv-toolchain = { workspace = true, features = ["clap", "schemars"]}
uv-types = { workspace = true }
uv-virtualenv = { workspace = true }
uv-warnings = { workspace = true }

6
crates/uv/src/cli.rs
View File

@ -14,7 +14,7 @@ use uv_configuration::{
};
use uv_normalize::{ExtraName, PackageName};
use uv_resolver::{AnnotationStyle, ExcludeNewer, PreReleaseMode, ResolutionMode};
use uv_toolchain::PythonVersion;
use uv_toolchain::{PythonVersion, ToolchainPreference};
use crate::commands::{extra_name_with_clap_error, ListFormat, VersionFormat};
use crate::compat;
@ -89,6 +89,10 @@ pub(crate) struct GlobalArgs {
#[arg(global = true, long, overrides_with("offline"), hide = true)]
pub(crate) no_offline: bool,
/// Whether to use system or uv-managed Python toolchains.
#[arg(global = true, long)]
pub(crate) toolchain_preference: Option<ToolchainPreference>,
/// Whether to enable experimental, preview features.
#[arg(global = true, long, hide = true, env = "UV_PREVIEW", value_parser = clap::builder::BoolishValueParser::new(), overrides_with("no_preview"))]
pub(crate) preview: bool,

6
crates/uv/src/commands/pip/compile.rs
View File

@ -89,6 +89,7 @@ pub(crate) async fn pip_compile(
link_mode: LinkMode,
python: Option<String>,
system: bool,
toolchain_preference: ToolchainPreference,
concurrency: Concurrency,
native_tls: bool,
quiet: bool,
@ -154,11 +155,10 @@ pub(crate) async fn pip_compile(
}
// Find an interpreter to use for building distributions
let preference = ToolchainPreference::from_settings(preview);
let environments = EnvironmentPreference::from_system_flag(system, false);
let interpreter = if let Some(python) = python.as_ref() {
let request = ToolchainRequest::parse(python);
Toolchain::find(&request, environments, preference, &cache)
Toolchain::find(&request, environments, toolchain_preference, &cache)
} else {
// TODO(zanieb): The split here hints at a problem with the abstraction; we should be able to use
// `Toolchain::find(...)` here.
@ -168,7 +168,7 @@ pub(crate) async fn pip_compile(
} else {
ToolchainRequest::default()
};
Toolchain::find_best(&request, environments, preference, &cache)
Toolchain::find_best(&request, environments, toolchain_preference, &cache)
}?
.into_interpreter();

4
crates/uv/src/commands/project/add.rs
View File

@ -6,7 +6,7 @@ use uv_distribution::pyproject_mut::PyProjectTomlMut;
use uv_git::GitResolver;
use uv_requirements::{NamedRequirementsResolver, RequirementsSource, RequirementsSpecification};
use uv_resolver::{FlatIndex, InMemoryIndex, OptionsBuilder};
use uv_toolchain::ToolchainRequest;
use uv_toolchain::{ToolchainPreference, ToolchainRequest};
use uv_types::{BuildIsolation, HashStrategy, InFlight};
use uv_cache::Cache;
@ -34,6 +34,7 @@ pub(crate) async fn add(
branch: Option<String>,
python: Option<String>,
settings: ResolverInstallerSettings,
toolchain_preference: ToolchainPreference,
preview: PreviewMode,
connectivity: Connectivity,
concurrency: Concurrency,
@ -52,6 +53,7 @@ pub(crate) async fn add(
let venv = project::init_environment(
project.workspace(),
python.as_deref().map(ToolchainRequest::parse),
toolchain_preference,
connectivity,
native_tls,
cache,

4
crates/uv/src/commands/project/lock.rs
View File

@ -18,7 +18,7 @@ use uv_resolver::{
ExcludeNewer, FlatIndex, InMemoryIndex, Lock, OptionsBuilder, PreReleaseMode, RequiresPython,
ResolutionMode,
};
use uv_toolchain::{Interpreter, ToolchainRequest};
use uv_toolchain::{Interpreter, ToolchainPreference, ToolchainRequest};
use uv_types::{BuildIsolation, EmptyInstalledPackages, HashStrategy, InFlight};
use uv_warnings::warn_user;
@ -33,6 +33,7 @@ pub(crate) async fn lock(
python: Option<String>,
settings: ResolverSettings,
preview: PreviewMode,
toolchain_preference: ToolchainPreference,
connectivity: Connectivity,
concurrency: Concurrency,
native_tls: bool,
@ -50,6 +51,7 @@ pub(crate) async fn lock(
let interpreter = project::find_interpreter(
&workspace,
python.as_deref().map(ToolchainRequest::parse),
toolchain_preference,
connectivity,
native_tls,
cache,

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

@ -139,6 +139,7 @@ pub(crate) fn interpreter_meets_requirements(
pub(crate) async fn find_interpreter(
workspace: &Workspace,
python_request: Option<ToolchainRequest>,
toolchain_preference: ToolchainPreference,
connectivity: Connectivity,
native_tls: bool,
cache: &Cache,
@ -183,8 +184,8 @@ pub(crate) async fn find_interpreter(
// Locate the Python interpreter to use in the environment
let interpreter = Toolchain::find_or_fetch(
python_request,
EnvironmentPreference::Any,
ToolchainPreference::from_settings(PreviewMode::Enabled),
EnvironmentPreference::OnlySystem,
toolchain_preference,
client_builder,
cache,
)
@ -215,6 +216,7 @@ pub(crate) async fn find_interpreter(
pub(crate) async fn init_environment(
workspace: &Workspace,
python: Option<ToolchainRequest>,
toolchain_preference: ToolchainPreference,
connectivity: Connectivity,
native_tls: bool,
cache: &Cache,
@ -248,8 +250,16 @@ pub(crate) async fn init_environment(
};
// Find an interpreter to create the environment with
let interpreter =
find_interpreter(workspace, python, connectivity, native_tls, cache, printer).await?;
let interpreter = find_interpreter(
workspace,
python,
toolchain_preference,
connectivity,
native_tls,
cache,
printer,
)
.await?;
let venv = workspace.venv();
writeln!(

4
crates/uv/src/commands/project/remove.rs
View File

@ -6,7 +6,7 @@ use uv_client::Connectivity;
use uv_configuration::{Concurrency, ExtrasSpecification, PreviewMode};
use uv_distribution::pyproject_mut::PyProjectTomlMut;
use uv_distribution::ProjectWorkspace;
use uv_toolchain::ToolchainRequest;
use uv_toolchain::{ToolchainPreference, ToolchainRequest};
use uv_warnings::warn_user;
use crate::commands::pip::operations::Modifications;
@ -20,6 +20,7 @@ pub(crate) async fn remove(
requirements: Vec<PackageName>,
dev: bool,
python: Option<String>,
toolchain_preference: ToolchainPreference,
preview: PreviewMode,
connectivity: Connectivity,
concurrency: Concurrency,
@ -85,6 +86,7 @@ pub(crate) async fn remove(
let venv = project::init_environment(
project.workspace(),
python.as_deref().map(ToolchainRequest::parse),
toolchain_preference,
connectivity,
native_tls,
cache,

4
crates/uv/src/commands/project/run.rs
View File

@ -35,6 +35,7 @@ pub(crate) async fn run(
settings: ResolverInstallerSettings,
isolated: bool,
preview: PreviewMode,
toolchain_preference: ToolchainPreference,
connectivity: Connectivity,
concurrency: Concurrency,
native_tls: bool,
@ -65,6 +66,7 @@ pub(crate) async fn run(
let venv = project::init_environment(
project.workspace(),
python.as_deref().map(ToolchainRequest::parse),
toolchain_preference,
connectivity,
native_tls,
cache,
@ -141,7 +143,7 @@ pub(crate) async fn run(
Toolchain::find_or_fetch(
python.as_deref().map(ToolchainRequest::parse),
EnvironmentPreference::Any,
ToolchainPreference::from_settings(PreviewMode::Enabled),
toolchain_preference,
client_builder,
cache,
)

4
crates/uv/src/commands/project/sync.rs
View File

@ -16,7 +16,7 @@ use uv_git::GitResolver;
use uv_installer::SitePackages;
use uv_normalize::PackageName;
use uv_resolver::{FlatIndex, InMemoryIndex, Lock};
use uv_toolchain::{PythonEnvironment, ToolchainRequest};
use uv_toolchain::{PythonEnvironment, ToolchainPreference, ToolchainRequest};
use uv_types::{BuildIsolation, HashStrategy, InFlight};
use uv_warnings::warn_user;
@ -33,6 +33,7 @@ pub(crate) async fn sync(
dev: bool,
modifications: Modifications,
python: Option<String>,
toolchain_preference: ToolchainPreference,
settings: InstallerSettings,
preview: PreviewMode,
connectivity: Connectivity,
@ -52,6 +53,7 @@ pub(crate) async fn sync(
let venv = project::init_environment(
project.workspace(),
python.as_deref().map(ToolchainRequest::parse),
toolchain_preference,
connectivity,
native_tls,
cache,

3
crates/uv/src/commands/tool/run.rs
View File

@ -30,6 +30,7 @@ pub(crate) async fn run(
settings: ResolverInstallerSettings,
_isolated: bool,
preview: PreviewMode,
toolchain_preference: ToolchainPreference,
connectivity: Connectivity,
concurrency: Concurrency,
native_tls: bool,
@ -73,7 +74,7 @@ pub(crate) async fn run(
.map(ToolchainRequest::parse)
.unwrap_or_default(),
EnvironmentPreference::OnlySystem,
ToolchainPreference::from_settings(preview),
toolchain_preference,
cache,
)?
.into_interpreter();

3
crates/uv/src/commands/toolchain/find.rs
View File

@ -14,6 +14,7 @@ use crate::printer::Printer;
#[allow(clippy::too_many_arguments)]
pub(crate) async fn find(
request: Option<String>,
toolchain_preference: ToolchainPreference,
preview: PreviewMode,
cache: &Cache,
printer: Printer,
@ -29,7 +30,7 @@ pub(crate) async fn find(
let toolchain = Toolchain::find(
&request,
EnvironmentPreference::OnlySystem,
ToolchainPreference::from_settings(PreviewMode::Enabled),
toolchain_preference,
cache,
)?;

3
crates/uv/src/commands/toolchain/list.rs
View File

@ -30,6 +30,7 @@ pub(crate) async fn list(
kinds: ToolchainListKinds,
all_versions: bool,
all_platforms: bool,
toolchain_preference: ToolchainPreference,
preview: PreviewMode,
cache: &Cache,
printer: Printer,
@ -56,7 +57,7 @@ pub(crate) async fn list(
let installed = find_toolchains(
&ToolchainRequest::Any,
EnvironmentPreference::OnlySystem,
ToolchainPreference::from_settings(preview),
toolchain_preference,
cache,
)
// Raise discovery errors if critical

5
crates/uv/src/commands/venv.rs
View File

@ -42,6 +42,7 @@ use crate::shell::Shell;
pub(crate) async fn venv(
path: &Path,
python_request: Option<&str>,
toolchain_preference: ToolchainPreference,
link_mode: LinkMode,
index_locations: &IndexLocations,
index_strategy: IndexStrategy,
@ -69,6 +70,7 @@ pub(crate) async fn venv(
connectivity,
seed,
preview,
toolchain_preference,
allow_existing,
exclude_newer,
native_tls,
@ -118,6 +120,7 @@ async fn venv_impl(
connectivity: Connectivity,
seed: bool,
preview: PreviewMode,
toolchain_preference: ToolchainPreference,
allow_existing: bool,
exclude_newer: Option<ExcludeNewer>,
native_tls: bool,
@ -137,7 +140,7 @@ async fn venv_impl(
let interpreter = Toolchain::find_or_fetch(
interpreter_request,
EnvironmentPreference::OnlySystem,
ToolchainPreference::from_settings(preview),
toolchain_preference,
client_builder,
cache,
)

20
crates/uv/src/main.rs
View File

@ -140,7 +140,7 @@ async fn run() -> Result<ExitStatus> {
};
// Resolve the global settings.
let globals = GlobalSettings::resolve(&cli.global_args, filesystem.as_ref());
let globals = GlobalSettings::resolve(&cli.command, &cli.global_args, filesystem.as_ref());
// Resolve the cache settings.
let cache_settings = CacheSettings::resolve(cli.cache_args, filesystem.as_ref());
@ -280,6 +280,7 @@ async fn run() -> Result<ExitStatus> {
args.settings.link_mode,
args.settings.python,
args.settings.system,
globals.toolchain_preference,
args.settings.concurrency,
globals.native_tls,
globals.quiet,
@ -585,6 +586,7 @@ async fn run() -> Result<ExitStatus> {
commands::venv(
&args.name,
args.settings.python.as_deref(),
globals.toolchain_preference,
args.settings.link_mode,
&args.settings.index_locations,
args.settings.index_strategy,
@ -626,6 +628,7 @@ async fn run() -> Result<ExitStatus> {
args.settings,
globals.isolated,
globals.preview,
globals.toolchain_preference,
globals.connectivity,
Concurrency::default(),
globals.native_tls,
@ -647,6 +650,7 @@ async fn run() -> Result<ExitStatus> {
args.dev,
args.modifications,
args.python,
globals.toolchain_preference,
args.settings,
globals.preview,
globals.connectivity,
@ -669,6 +673,7 @@ async fn run() -> Result<ExitStatus> {
args.python,
args.settings,
globals.preview,
globals.toolchain_preference,
globals.connectivity,
Concurrency::default(),
globals.native_tls,
@ -696,6 +701,7 @@ async fn run() -> Result<ExitStatus> {
args.branch,
args.python,
args.settings,
globals.toolchain_preference,
globals.preview,
globals.connectivity,
Concurrency::default(),
@ -717,6 +723,7 @@ async fn run() -> Result<ExitStatus> {
args.requirements,
args.dev,
args.python,
globals.toolchain_preference,
globals.preview,
globals.connectivity,
Concurrency::default(),
@ -756,6 +763,7 @@ async fn run() -> Result<ExitStatus> {
args.settings,
globals.isolated,
globals.preview,
globals.toolchain_preference,
globals.connectivity,
Concurrency::default(),
globals.native_tls,
@ -778,6 +786,7 @@ async fn run() -> Result<ExitStatus> {
args.kinds,
args.all_versions,
args.all_platforms,
globals.toolchain_preference,
globals.preview,
&cache,
printer,
@ -814,7 +823,14 @@ async fn run() -> Result<ExitStatus> {
// Initialize the cache.
let cache = cache.init()?;
commands::toolchain_find(args.request, globals.preview, &cache, printer).await
commands::toolchain_find(
args.request,
globals.toolchain_preference,
globals.preview,
&cache,
printer,
)
.await
}
}
}

44
crates/uv/src/settings.rs
View File

@ -22,12 +22,12 @@ use uv_settings::{
Combine, FilesystemOptions, InstallerOptions, Options, PipOptions, ResolverInstallerOptions,
ResolverOptions,
};
use uv_toolchain::{Prefix, PythonVersion, Target};
use uv_toolchain::{Prefix, PythonVersion, Target, ToolchainPreference};
use crate::cli::{
AddArgs, BuildArgs, ColorChoice, ExternalCommand, GlobalArgs, IndexArgs, InstallerArgs,
LockArgs, Maybe, PipCheckArgs, PipCompileArgs, PipFreezeArgs, PipInstallArgs, PipListArgs,
PipShowArgs, PipSyncArgs, PipUninstallArgs, RefreshArgs, RemoveArgs, ResolverArgs,
AddArgs, BuildArgs, ColorChoice, Commands, ExternalCommand, GlobalArgs, IndexArgs,
InstallerArgs, LockArgs, Maybe, PipCheckArgs, PipCompileArgs, PipFreezeArgs, PipInstallArgs,
PipListArgs, PipShowArgs, PipSyncArgs, PipUninstallArgs, RefreshArgs, RemoveArgs, ResolverArgs,
ResolverInstallerArgs, RunArgs, SyncArgs, ToolRunArgs, ToolchainFindArgs, ToolchainInstallArgs,
ToolchainListArgs, VenvArgs,
};
@ -46,11 +46,35 @@ pub(crate) struct GlobalSettings {
pub(crate) isolated: bool,
pub(crate) show_settings: bool,
pub(crate) preview: PreviewMode,
pub(crate) toolchain_preference: ToolchainPreference,
}
impl GlobalSettings {
/// Resolve the [`GlobalSettings`] from the CLI and filesystem configuration.
pub(crate) fn resolve(args: &GlobalArgs, workspace: Option<&FilesystemOptions>) -> Self {
pub(crate) fn resolve(
command: &Commands,
args: &GlobalArgs,
workspace: Option<&FilesystemOptions>,
) -> Self {
let preview = PreviewMode::from(
flag(args.preview, args.no_preview)
.combine(workspace.and_then(|workspace| workspace.globals.preview))
.unwrap_or(false),
);
// Always use preview mode toolchain preferences during preview commands
// TODO(zanieb): There should be a cleaner way to do this, we should probably resolve
// force preview to true for these commands but it would break our experimental warning
// right now
let default_toolchain_preference = if matches!(
command,
Commands::Project(_) | Commands::Toolchain(_) | Commands::Tool(_)
) {
ToolchainPreference::default_from(PreviewMode::Enabled)
} else {
ToolchainPreference::default_from(preview)
};
Self {
quiet: args.quiet,
verbose: args.verbose,
@ -84,11 +108,11 @@ impl GlobalSettings {
},
isolated: args.isolated,
show_settings: args.show_settings,
preview: PreviewMode::from(
flag(args.preview, args.no_preview)
.combine(workspace.and_then(|workspace| workspace.globals.preview))
.unwrap_or(false),
),
preview,
toolchain_preference: args
.toolchain_preference
.combine(workspace.and_then(|workspace| workspace.globals.toolchain_preference))
.unwrap_or(default_toolchain_preference),
}
}
}

16
crates/uv/tests/show_settings.rs
View File

@ -57,6 +57,7 @@ fn resolve_uv_toml() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -183,6 +184,7 @@ fn resolve_uv_toml() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -310,6 +312,7 @@ fn resolve_uv_toml() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -469,6 +472,7 @@ fn resolve_pyproject_toml() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -597,6 +601,7 @@ fn resolve_pyproject_toml() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -711,6 +716,7 @@ fn resolve_pyproject_toml() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -862,6 +868,7 @@ fn resolve_index_url() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -1013,6 +1020,7 @@ fn resolve_index_url() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -1209,6 +1217,7 @@ fn resolve_find_links() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -1354,6 +1363,7 @@ fn resolve_top_level() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -1474,6 +1484,7 @@ fn resolve_top_level() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -1622,6 +1633,7 @@ fn resolve_top_level() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -1794,6 +1806,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -1904,6 +1917,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -2014,6 +2028,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,
@ -2126,6 +2141,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> {
isolated: false,
show_settings: true,
preview: Disabled,
toolchain_preference: OnlySystem,
}
CacheSettings {
no_cache: false,

49
uv.schema.json generated
View File

@ -228,6 +228,16 @@
"$ref": "#/definitions/Source"
}
},
"toolchain-preference": {
"anyOf": [
{
"$ref": "#/definitions/ToolchainPreference"
},
{
"type": "null"
}
]
},
"upgrade": {
"type": [
"boolean",
@ -1150,6 +1160,45 @@
}
}
}
},
"ToolchainPreference": {
"oneOf": [
{
"description": "Only use managed interpreters, never use system interpreters.",
"type": "string",
"enum": [
"only-managed"
]
},
{
"description": "Prefer installed managed interpreters, but use system interpreters if not found. If neither can be found, download a managed interpreter.",
"type": "string",
"enum": [
"prefer-installed-managed"
]
},
{
"description": "Prefer managed interpreters, even if one needs to be downloaded, but use system interpreters if found.",
"type": "string",
"enum": [
"prefer-managed"
]
},
{
"description": "Prefer system interpreters, only use managed interpreters if no system interpreter is found.",
"type": "string",
"enum": [
"prefer-system"
]
},
{
"description": "Only use system interpreters, never use managed interpreters.",
"type": "string",
"enum": [
"only-system"
]
}
]
}
}
}