From fc303b40964cf5299c25129e0af865210858c2b4 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Fri, 27 Sep 2024 15:38:39 -0400 Subject: [PATCH] Pin named indexes --- crates/uv-workspace/src/pyproject.rs | 12 +++++++++++- crates/uv/src/commands/project/add.rs | 17 ++++++++++++++++- crates/uv/tests/edit.rs | 13 ++++++++++--- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/crates/uv-workspace/src/pyproject.rs b/crates/uv-workspace/src/pyproject.rs index 724f50dc668c5..9c764327640c4 100644 --- a/crates/uv-workspace/src/pyproject.rs +++ b/crates/uv-workspace/src/pyproject.rs @@ -544,6 +544,7 @@ impl Source { source: RequirementSource, workspace: bool, editable: Option, + index: Option, rev: Option, tag: Option, branch: Option, @@ -581,7 +582,16 @@ impl Source { } let source = match source { - RequirementSource::Registry { .. } => return Ok(None), + RequirementSource::Registry { index: Some(_), .. } => { + return Ok(None); + } + RequirementSource::Registry { index: None, .. } => { + if let Some(index) = index { + Source::Registry { index } + } else { + return Ok(None); + } + } RequirementSource::Path { install_path, .. } | RequirementSource::Directory { install_path, .. } => Source::Path { editable, diff --git a/crates/uv/src/commands/project/add.rs b/crates/uv/src/commands/project/add.rs index b17a822721567..9789fa1b7fa74 100644 --- a/crates/uv/src/commands/project/add.rs +++ b/crates/uv/src/commands/project/add.rs @@ -346,6 +346,13 @@ pub(crate) async fn add( requirements }; + // If the user provides a single, named index, pin all requirements to that index. + let index = indexes + .first() + .as_ref() + .and_then(|index| index.name.as_ref()) + .filter(|_| indexes.len() == 1); + // Add the requirements to the `pyproject.toml` or script. let mut toml = match &target { Target::Script(script, _) => { @@ -374,6 +381,7 @@ pub(crate) async fn add( requirement, false, editable, + index.cloned(), rev.clone(), tag.clone(), branch.clone(), @@ -389,6 +397,7 @@ pub(crate) async fn add( requirement, workspace, editable, + index.cloned(), rev.clone(), tag.clone(), branch.clone(), @@ -655,7 +664,11 @@ async fn lock_and_sync( }; // Only set a minimum version for registry requirements. - if edit.source.is_some() { + if edit + .source + .as_ref() + .is_some_and(|source| !matches!(source, Source::Registry { .. })) + { continue; } @@ -846,6 +859,7 @@ fn resolve_requirement( requirement: pypi_types::Requirement, workspace: bool, editable: Option, + index: Option, rev: Option, tag: Option, branch: Option, @@ -856,6 +870,7 @@ fn resolve_requirement( requirement.source.clone(), workspace, editable, + index, rev, tag, branch, diff --git a/crates/uv/tests/edit.rs b/crates/uv/tests/edit.rs index 7e17852a6f9e5..e7208d15442dc 100644 --- a/crates/uv/tests/edit.rs +++ b/crates/uv/tests/edit.rs @@ -5067,7 +5067,7 @@ fn add_no_warn_index_url() -> Result<()> { /// Add an index provided via `--index`. #[test] -fn add_index_url() -> Result<()> { +fn add_index() -> Result<()> { let context = TestContext::new("3.12"); let pyproject_toml = context.temp_dir.child("pyproject.toml"); @@ -5152,6 +5152,7 @@ fn add_index_url() -> Result<()> { ----- stdout ----- ----- stderr ----- + warning: Missing version constraint (e.g., a lower bound) for `jinja2` Resolved 4 packages in [TIME] Prepared 2 packages in [TIME] Installed 2 packages in [TIME] @@ -5181,6 +5182,9 @@ fn add_index_url() -> Result<()> { [[tool.uv.index]] url = "https://pypi.org/simple" + + [tool.uv.sources] + jinja2 = { index = "pytorch" } "### ); }); @@ -5240,7 +5244,7 @@ fn add_index_url() -> Result<()> { [package.metadata] requires-dist = [ { name = "iniconfig", specifier = "==2.0.0" }, - { name = "jinja2", specifier = ">=3.1.3" }, + { name = "jinja2", specifier = ">=3.1.3", index = "https://download.pytorch.org/whl/cu121" }, ] "### ); @@ -5279,6 +5283,9 @@ fn add_index_url() -> Result<()> { [[tool.uv.index]] url = "https://pypi.org/simple" + + [tool.uv.sources] + jinja2 = { index = "pytorch" } "### ); }); @@ -5344,7 +5351,7 @@ fn add_index_url() -> Result<()> { [package.metadata] requires-dist = [ { name = "iniconfig", specifier = "==2.0.0" }, - { name = "jinja2", specifier = ">=3.1.3" }, + { name = "jinja2", specifier = ">=3.1.3", index = "https://test.pypi.org/simple" }, ] "### );