From 3cffc0bcc910c27b04e0f56b3d74542a3e002397 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Tue, 30 Jul 2024 16:37:18 -0500 Subject: [PATCH] Replace `--python-preference installed` with `managed` Collapses the previous default into "managed" and makes the "managed" behavior match "installed". People should use "only-managed" if they want that behavior, it seems overly complicated otherwise. --- crates/uv-python/src/discovery.rs | 17 ++++++------ crates/uv-python/src/installation.rs | 7 ----- crates/uv/tests/help.rs | 40 ++++++++++++---------------- docs/settings.md | 3 +-- uv.schema.json | 9 +------ 5 files changed, 27 insertions(+), 49 deletions(-) diff --git a/crates/uv-python/src/discovery.rs b/crates/uv-python/src/discovery.rs index 5e7d7ea846ec..b2ace2f59e6e 100644 --- a/crates/uv-python/src/discovery.rs +++ b/crates/uv-python/src/discovery.rs @@ -61,12 +61,11 @@ pub enum PythonRequest { pub enum PythonPreference { /// Only use managed Python installations; never use system Python installations. OnlyManaged, - /// Prefer installed Python installations, only download managed Python installations if no system Python installation is found. - /// - /// Installed managed Python installations are still preferred over system Python installations. #[default] - Installed, - /// Prefer managed Python installations over system Python installations, even if fetching is required. + /// Prefer managed Python installations over system Python installations. + /// + /// System Python installations are still preferred over downloading managed Python versions. + /// Use `only-managed` to always fetch a managed Python version. Managed, /// Prefer system Python installations over managed Python installations. /// @@ -305,7 +304,7 @@ fn python_executables_from_installed<'a>( match preference { PythonPreference::OnlyManaged => Box::new(from_managed_installations), - PythonPreference::Managed | PythonPreference::Installed => Box::new( + PythonPreference::Managed => Box::new( from_managed_installations .chain(from_search_path) .chain(from_py_launcher), @@ -1272,7 +1271,7 @@ impl PythonPreference { match self { PythonPreference::OnlyManaged => matches!(source, PythonSource::Managed), - Self::Managed | Self::System | Self::Installed => matches!( + Self::Managed | Self::System => matches!( source, PythonSource::Managed | PythonSource::SearchPath | PythonSource::PyLauncher ), @@ -1295,7 +1294,7 @@ impl PythonPreference { } pub(crate) fn allows_managed(self) -> bool { - matches!(self, Self::Managed | Self::OnlyManaged | Self::Installed) + matches!(self, Self::Managed | Self::OnlyManaged) } } @@ -1603,7 +1602,7 @@ impl PythonPreference { fn sources(self) -> &'static [&'static str] { match self { Self::OnlyManaged => &["managed installations"], - Self::Managed | Self::Installed | Self::System => { + Self::Managed | Self::System => { if cfg!(windows) { &["managed installations", "system path", "`py` launcher"] } else { diff --git a/crates/uv-python/src/installation.rs b/crates/uv-python/src/installation.rs index 28fcdba766a3..ef525d3c868a 100644 --- a/crates/uv-python/src/installation.rs +++ b/crates/uv-python/src/installation.rs @@ -88,13 +88,6 @@ impl PythonInstallation { ) -> Result { let request = request.unwrap_or_default(); - // Perform a fetch aggressively if managed Python is preferred - if matches!(preference, PythonPreference::Managed) && python_fetch.is_automatic() { - if let Some(request) = PythonDownloadRequest::from_request(&request) { - return Self::fetch(request.fill(), client_builder, cache, reporter).await; - } - } - // Search for the installation match Self::find(&request, environments, preference, cache) { Ok(venv) => Ok(venv), diff --git a/crates/uv/tests/help.rs b/crates/uv/tests/help.rs index ae95fa5834f4..753a6cec3972 100644 --- a/crates/uv/tests/help.rs +++ b/crates/uv/tests/help.rs @@ -38,8 +38,8 @@ fn help() { Disable network access, relying only on locally cached data and locally available files --python-preference Whether to prefer using Python installations that are already present on the system, or - those that are downloaded and installed by uv [possible values: only-managed, installed, - managed, system, only-system] + those that are downloaded and installed by uv [possible values: only-managed, managed, + system, only-system] --python-fetch Whether to automatically download Python when required [possible values: automatic, manual] @@ -104,8 +104,8 @@ fn help_flag() { Disable network access, relying only on locally cached data and locally available files --python-preference Whether to prefer using Python installations that are already present on the system, or - those that are downloaded and installed by uv [possible values: only-managed, installed, - managed, system, only-system] + those that are downloaded and installed by uv [possible values: only-managed, managed, + system, only-system] --python-fetch Whether to automatically download Python when required [possible values: automatic, manual] @@ -169,8 +169,8 @@ fn help_short_flag() { Disable network access, relying only on locally cached data and locally available files --python-preference Whether to prefer using Python installations that are already present on the system, or - those that are downloaded and installed by uv [possible values: only-managed, installed, - managed, system, only-system] + those that are downloaded and installed by uv [possible values: only-managed, managed, + system, only-system] --python-fetch Whether to automatically download Python when required [possible values: automatic, manual] @@ -264,10 +264,7 @@ fn help_subcommand() { Possible values: - only-managed: Only use managed Python installations; never use system Python installations - - installed: Prefer installed Python installations, only download managed Python - installations if no system Python installation is found - - managed: Prefer managed Python installations over system Python installations, even - if fetching is required + - managed: Prefer managed Python installations over system Python installations - system: Prefer system Python installations over managed Python installations - only-system: Only use system Python installations; never use managed Python installations @@ -392,10 +389,7 @@ fn help_subsubcommand() { Possible values: - only-managed: Only use managed Python installations; never use system Python installations - - installed: Prefer installed Python installations, only download managed Python - installations if no system Python installation is found - - managed: Prefer managed Python installations over system Python installations, even - if fetching is required + - managed: Prefer managed Python installations over system Python installations - system: Prefer system Python installations over managed Python installations - only-system: Only use system Python installations; never use managed Python installations @@ -485,8 +479,8 @@ fn help_flag_subcommand() { Disable network access, relying only on locally cached data and locally available files --python-preference Whether to prefer using Python installations that are already present on the system, or - those that are downloaded and installed by uv [possible values: only-managed, installed, - managed, system, only-system] + those that are downloaded and installed by uv [possible values: only-managed, managed, + system, only-system] --python-fetch Whether to automatically download Python when required [possible values: automatic, manual] @@ -547,8 +541,8 @@ fn help_flag_subsubcommand() { Disable network access, relying only on locally cached data and locally available files --python-preference Whether to prefer using Python installations that are already present on the system, or - those that are downloaded and installed by uv [possible values: only-managed, installed, - managed, system, only-system] + those that are downloaded and installed by uv [possible values: only-managed, managed, + system, only-system] --python-fetch Whether to automatically download Python when required [possible values: automatic, manual] @@ -666,8 +660,8 @@ fn help_with_global_option() { Disable network access, relying only on locally cached data and locally available files --python-preference Whether to prefer using Python installations that are already present on the system, or - those that are downloaded and installed by uv [possible values: only-managed, installed, - managed, system, only-system] + those that are downloaded and installed by uv [possible values: only-managed, managed, + system, only-system] --python-fetch Whether to automatically download Python when required [possible values: automatic, manual] @@ -729,7 +723,7 @@ fn help_with_version() { } #[test] -fn test_with_no_pager() { +fn help_with_no_pager() { let context = TestContext::new_with_versions(&[]); // We can't really test whether the --no-pager option works with a snapshot test. @@ -765,8 +759,8 @@ fn test_with_no_pager() { Disable network access, relying only on locally cached data and locally available files --python-preference Whether to prefer using Python installations that are already present on the system, or - those that are downloaded and installed by uv [possible values: only-managed, installed, - managed, system, only-system] + those that are downloaded and installed by uv [possible values: only-managed, managed, + system, only-system] --python-fetch Whether to automatically download Python when required [possible values: automatic, manual] diff --git a/docs/settings.md b/docs/settings.md index 197db5492e23..31e9b8c3f572 100644 --- a/docs/settings.md +++ b/docs/settings.md @@ -648,8 +648,7 @@ those that are downloaded and installed by uv. **Possible values**: - `"only-managed"`: Only use managed Python installations; never use system Python installations -- `"installed"`: Prefer installed Python installations, only download managed Python installations if no system Python installation is found -- `"managed"`: Prefer managed Python installations over system Python installations, even if fetching is required +- `"managed"`: Prefer managed Python installations over system Python installations - `"system"`: Prefer system Python installations over managed Python installations - `"only-system"`: Only use system Python installations; never use managed Python installations diff --git a/uv.schema.json b/uv.schema.json index 15153b00777c..c69e9e0ba703 100644 --- a/uv.schema.json +++ b/uv.schema.json @@ -1001,14 +1001,7 @@ ] }, { - "description": "Prefer installed Python installations, only download managed Python installations if no system Python installation is found.\n\nInstalled managed Python installations are still preferred over system Python installations.", - "type": "string", - "enum": [ - "installed" - ] - }, - { - "description": "Prefer managed Python installations over system Python installations, even if fetching is required.", + "description": "Prefer managed Python installations over system Python installations.\n\nSystem Python installations are still preferred over downloading managed Python versions. Use `only-managed` to always fetch a managed Python version.", "type": "string", "enum": [ "managed"