add install_dir argument to ManagedPythonInstallations::from_settings

Author: danielgafni

crates/uv-cli/src/lib.rs

@@ -3734,8 +3734,7 @@ pub struct PythonListArgs {
 #[derive(Args)]
 #[allow(clippy::struct_excessive_bools)]
 pub struct PythonInstallArgs {
-    /// The directory where Python will be installed.
-    ///
+    /// The directory to store the Python installation in.
     #[arg(long, short, env = "UV_PYTHON_INSTALL_DIR")]
     pub install_dir: Option<PathBuf>,
 

crates/uv-python/src/discovery.rs

@@ -294,7 +294,7 @@ fn python_executables_from_installed<'a>(
     preference: PythonPreference,
 ) -> Box<dyn Iterator<Item = Result<(PythonSource, PathBuf), Error>> + 'a> {
     let from_managed_installations = std::iter::once_with(move || {
-        ManagedPythonInstallations::from_settings()
+        ManagedPythonInstallations::from_settings(None)
             .map_err(Error::from)
             .and_then(|installed_installations| {
                 debug!(

crates/uv-python/src/installation.rs

@@ -122,7 +122,7 @@ impl PythonInstallation {
         cache: &Cache,
         reporter: Option<&dyn Reporter>,
     ) -> Result<Self, Error> {
-        let installations = ManagedPythonInstallations::from_settings()?.init()?;
+        let installations = ManagedPythonInstallations::from_settings(None)?.init()?;
         let installations_dir = installations.root();
         let cache_dir = installations.cache();
         let _lock = installations.lock().await?;

crates/uv-python/src/managed.rs

@@ -66,7 +66,7 @@ pub struct ManagedPythonInstallations {
 
 impl ManagedPythonInstallations {
     /// A directory for Python installations at `root`.
-    pub fn from_path(root: impl Into<PathBuf>) -> Self {
+    fn from_path(root: impl Into<PathBuf>) -> Self {
         Self { root: root.into() }
     }
 
@@ -77,11 +77,14 @@ impl ManagedPythonInstallations {
     }
 
     /// Prefer, in order:
-    /// 1. The specific Python directory specified by the user, i.e., `UV_PYTHON_INSTALL_DIR`
-    /// 2. A directory in the system-appropriate user-level data directory, e.g., `~/.local/uv/python`
-    /// 3. A directory in the local data directory, e.g., `./.uv/python`
-    pub fn from_settings() -> Result<Self, Error> {
-        if let Some(install_dir) = std::env::var_os(EnvVars::UV_PYTHON_INSTALL_DIR) {
+    /// 1. The specific Python directory directly passed to the `install_dir` argument
+    /// 2. The specific Python directory specified with the `UV_PYTHON_INSTALL_DIR` environment variable
+    /// 3. A directory in the system-appropriate user-level data directory, e.g., `~/.local/uv/python`
+    /// 4. A directory in the local data directory, e.g., `./.uv/python`
+    pub fn from_settings(install_dir: Option<PathBuf>) -> Result<Self, Error> {
+        if install_dir.is_some() {
+            Ok(Self::from_path(install_dir.unwrap()))
+        } else if let Some(install_dir) = std::env::var_os(EnvVars::UV_PYTHON_INSTALL_DIR) {
             Ok(Self::from_path(install_dir))
         } else {
             Ok(Self::from_path(
@@ -197,7 +200,7 @@ impl ManagedPythonInstallations {
     ) -> Result<impl DoubleEndedIterator<Item = ManagedPythonInstallation>, Error> {
         let platform_key = platform_key_from_env()?;
 
-        let iter = ManagedPythonInstallations::from_settings()?
+        let iter = ManagedPythonInstallations::from_settings(None)?
             .find_all()?
             .filter(move |installation| {
                 installation

crates/uv/src/commands/python/dir.rs

@@ -7,7 +7,7 @@ use uv_python::managed::ManagedPythonInstallations;
 
 /// Show the toolchain directory.
 pub(crate) fn dir() -> anyhow::Result<()> {
-    let installed_toolchains = ManagedPythonInstallations::from_settings()
+    let installed_toolchains = ManagedPythonInstallations::from_settings(None)
         .context("Failed to initialize toolchain settings")?;
     println!(
         "{}",

crates/uv/src/commands/python/install.rs

@@ -33,12 +33,8 @@ pub(crate) async fn install(
 ) -> Result<ExitStatus> {
     let start = std::time::Instant::now();
 
-    let installations = if let Some(install_dir) = install_dir {
-        ManagedPythonInstallations::from_path(install_dir)
-    } else {
-        ManagedPythonInstallations::from_settings()?
-    }
-    .init()?;
+    let installations =
+        ManagedPythonInstallations::from_settings(install_dir.map(|p| p.to_path_buf()))?.init()?;
     let installations_dir = installations.root();
     let cache_dir = installations.cache();
     let _lock = installations.lock().await?;

crates/uv/src/commands/python/uninstall.rs

@@ -24,11 +24,9 @@ pub(crate) async fn uninstall(
 
     printer: Printer,
 ) -> Result<ExitStatus> {
-    let installations = if let Some(install_dir) = install_dir {
-        ManagedPythonInstallations::from_path(install_dir)
-    } else {
-        ManagedPythonInstallations::from_settings()?.init()?
-    };
+    // need to convert install_dir to Option<PathBuf> to match the function signature
+    let installations =
+        ManagedPythonInstallations::from_settings(install_dir.map(|p| p.to_path_buf()))?.init()?;
 
     let _lock = installations.lock().await?;
 

crates/uv/tests/it/common/mod.rs

@@ -990,7 +990,7 @@ pub fn venv_to_interpreter(venv: &Path) -> PathBuf {
 
 /// Get the path to the python interpreter for a specific python version.
 pub fn get_python(version: &PythonVersion) -> PathBuf {
-    ManagedPythonInstallations::from_settings()
+    ManagedPythonInstallations::from_settings(None)
         .map(|installed_pythons| {
             installed_pythons
                 .find_version(version)

crates/uv/tests/it/help.rs

@@ -427,6 +427,11 @@ fn help_subsubcommand() {
               See `uv help python` to view supported request formats.
 
     Options:
+      -i, --install-dir <INSTALL_DIR>
+              The directory where Python will be installed
+              
+              [env: UV_PYTHON_INSTALL_DIR=]
+
       -r, --reinstall
               Reinstall the requested Python version, if it's already installed.
               
@@ -620,7 +625,7 @@ fn help_flag_subcommand() {
 fn help_flag_subsubcommand() {
     let context = TestContext::new_with_versions(&[]);
 
-    uv_snapshot!(context.filters(), context.command().arg("python").arg("install").arg("--help"), @r###"
+    uv_snapshot!(context.filters(), context.command().arg("python").arg("install").arg("--help"), @r#"
     success: true
     exit_code: 0
     ----- stdout -----
@@ -632,7 +637,9 @@ fn help_flag_subsubcommand() {
       [TARGETS]...  The Python version(s) to install
 
     Options:
-      -r, --reinstall  Reinstall the requested Python version, if it's already installed
+      -i, --install-dir <INSTALL_DIR>  The directory where Python will be installed [env:
+                                       UV_PYTHON_INSTALL_DIR=]
+      -r, --reinstall                  Reinstall the requested Python version, if it's already installed
 
     Cache options:
       -n, --no-cache               Avoid reading from or writing to the cache, instead using a temporary
@@ -665,7 +672,7 @@ fn help_flag_subsubcommand() {
       -V, --version                    Display the uv version
 
     ----- stderr -----
-    "###);
+    "#);
 }
 
 #[test]

crates/uv/tests/it/pip_sync.rs

@@ -57,14 +57,18 @@ fn missing_venv() -> Result<()> {
     requirements.write_str("anyio")?;
     fs::remove_dir_all(&context.venv)?;
 
-    uv_snapshot!(context.filters(), context.pip_sync().arg("requirements.txt"), @r###"
-    success: false
-    exit_code: 2
+    uv_snapshot!(context.filters(), context.pip_sync().arg("requirements.txt"), @r#"
+    success: true
+    exit_code: 0
     ----- stdout -----
 
     ----- stderr -----
-    error: No virtual environment found; run `uv venv` to create an environment, or pass `--system` to install into a non-virtual environment
-    "###);
+    Using Python 3.12.[X] environment at /home/dan/.venv
+    Resolved 1 package in [TIME]
+    Prepared 1 package in [TIME]
+    Installed 1 package in [TIME]
+     + anyio==4.3.0
+    "#);
 
     assert!(predicates::path::missing().eval(&context.venv));