diff --git a/crates/uv-resolver/src/error.rs b/crates/uv-resolver/src/error.rs index b6bc323ddf7e..37939babe1ef 100644 --- a/crates/uv-resolver/src/error.rs +++ b/crates/uv-resolver/src/error.rs @@ -52,6 +52,16 @@ pub enum ResolveError { fork_markers: MarkerTree, }, + #[error("Requirements contain conflicting indexes for package `{0}`:\n- {}", _1.join("\n- "))] + ConflictingIndexesUniversal(PackageName, Vec), + + #[error("Requirements contain conflicting indexes for package `{package_name}` in split `{fork_markers:?}`:\n- {}", indexes.join("\n- "))] + ConflictingIndexesFork { + package_name: PackageName, + indexes: Vec, + fork_markers: MarkerTree, + }, + #[error("Requirements contain conflicting indexes for package `{0}`: `{1}` vs. `{2}`")] ConflictingIndexes(PackageName, String, String), diff --git a/crates/uv-resolver/src/fork_indexes.rs b/crates/uv-resolver/src/fork_indexes.rs new file mode 100644 index 000000000000..7ada89a78709 --- /dev/null +++ b/crates/uv-resolver/src/fork_indexes.rs @@ -0,0 +1,57 @@ +use std::collections::hash_map::Entry; + +use rustc_hash::FxHashMap; + +use distribution_types::IndexUrl; +use uv_normalize::PackageName; + +use crate::resolver::ResolverMarkers; +use crate::ResolveError; + +/// See [`crate::resolver::ForkState`]. +#[derive(Default, Debug, Clone)] +pub(crate) struct ForkIndexes(FxHashMap); + +impl ForkIndexes { + /// Get the [`IndexUrl`] previously used for a package in this fork. + pub(crate) fn get(&self, package_name: &PackageName) -> Option<&IndexUrl> { + self.0.get(package_name) + } + + /// Check that this is the only [`IndexUrl`] used for this package in this fork. + pub(crate) fn insert( + &mut self, + package_name: &PackageName, + index: &IndexUrl, + fork_markers: &ResolverMarkers, + ) -> Result<(), ResolveError> { + match self.0.entry(package_name.clone()) { + Entry::Occupied(previous) => { + if previous.get() != index { + let mut conflicts = vec![previous.get().to_string(), index.to_string()]; + conflicts.sort(); + return match fork_markers { + ResolverMarkers::Universal { .. } + | ResolverMarkers::SpecificEnvironment(_) => { + Err(ResolveError::ConflictingIndexesUniversal( + package_name.clone(), + conflicts, + )) + } + ResolverMarkers::Fork(fork_markers) => { + Err(ResolveError::ConflictingIndexesFork { + package_name: package_name.clone(), + indexes: conflicts, + fork_markers: fork_markers.clone(), + }) + } + }; + } + } + Entry::Vacant(vacant) => { + vacant.insert(index.clone()); + } + } + Ok(()) + } +} diff --git a/crates/uv-resolver/src/fork_urls.rs b/crates/uv-resolver/src/fork_urls.rs index cad2b5925928..c493b042af96 100644 --- a/crates/uv-resolver/src/fork_urls.rs +++ b/crates/uv-resolver/src/fork_urls.rs @@ -9,7 +9,7 @@ use uv_normalize::PackageName; use crate::resolver::ResolverMarkers; use crate::ResolveError; -/// See [`crate::resolver::SolveState`]. +/// See [`crate::resolver::ForkState`]. #[derive(Default, Debug, Clone)] pub(crate) struct ForkUrls(FxHashMap); diff --git a/crates/uv-resolver/src/lib.rs b/crates/uv-resolver/src/lib.rs index 82345e6bce1c..3a62e7d2fe33 100644 --- a/crates/uv-resolver/src/lib.rs +++ b/crates/uv-resolver/src/lib.rs @@ -34,6 +34,7 @@ mod error; mod exclude_newer; mod exclusions; mod flat_index; +mod fork_indexes; mod fork_urls; mod graph_ops; mod lock; diff --git a/crates/uv-resolver/src/resolution/graph.rs b/crates/uv-resolver/src/resolution/graph.rs index 459cbf08cff8..cb6f12be7015 100644 --- a/crates/uv-resolver/src/resolution/graph.rs +++ b/crates/uv-resolver/src/resolution/graph.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use std::fmt::{Display, Formatter}; use distribution_types::{ - Dist, DistributionMetadata, Name, ResolutionDiagnostic, ResolvedDist, VersionId, + Dist, DistributionMetadata, IndexUrl, Name, ResolutionDiagnostic, ResolvedDist, VersionId, VersionOrUrlRef, }; use indexmap::IndexSet; @@ -88,6 +88,7 @@ struct PackageRef<'a> { package_name: &'a PackageName, version: &'a Version, url: Option<&'a VerbatimParsedUrl>, + index: Option<&'a IndexUrl>, extra: Option<&'a ExtraName>, group: Option<&'a GroupName>, } @@ -284,6 +285,7 @@ impl ResolutionGraph { package_name: from, version: &edge.from_version, url: edge.from_url.as_ref(), + index: edge.from_index.as_ref(), extra: edge.from_extra.as_ref(), group: edge.from_dev.as_ref(), }] @@ -292,6 +294,7 @@ impl ResolutionGraph { package_name: &edge.to, version: &edge.to_version, url: edge.to_url.as_ref(), + index: edge.to_index.as_ref(), extra: edge.to_extra.as_ref(), group: edge.to_dev.as_ref(), }]; @@ -320,7 +323,7 @@ impl ResolutionGraph { diagnostics: &mut Vec, preferences: &Preferences, pins: &FilePins, - index: &InMemoryIndex, + in_memory: &InMemoryIndex, git: &GitResolver, package: &'a ResolutionPackage, version: &'a Version, @@ -330,16 +333,18 @@ impl ResolutionGraph { extra, dev, url, + index, } = &package; // Map the package to a distribution. let (dist, hashes, metadata) = Self::parse_dist( name, + index.as_ref(), url.as_ref(), version, pins, diagnostics, preferences, - index, + in_memory, git, )?; @@ -366,7 +371,7 @@ impl ResolutionGraph { } // Add the distribution to the graph. - let index = petgraph.add_node(ResolutionGraphNode::Dist(AnnotatedDist { + let node = petgraph.add_node(ResolutionGraphNode::Dist(AnnotatedDist { dist, name: name.clone(), version: version.clone(), @@ -381,22 +386,24 @@ impl ResolutionGraph { package_name: name, version, url: url.as_ref(), + index: index.as_ref(), extra: extra.as_ref(), group: dev.as_ref(), }, - index, + node, ); Ok(()) } fn parse_dist( name: &PackageName, + index: Option<&IndexUrl>, url: Option<&VerbatimParsedUrl>, version: &Version, pins: &FilePins, diagnostics: &mut Vec, preferences: &Preferences, - index: &InMemoryIndex, + in_memory: &InMemoryIndex, git: &GitResolver, ) -> Result<(ResolvedDist, Vec, Option), ResolveError> { Ok(if let Some(url) = url { @@ -406,14 +413,24 @@ impl ResolutionGraph { let version_id = VersionId::from_url(&url.verbatim); // Extract the hashes. - let hashes = - Self::get_hashes(name, Some(url), &version_id, version, preferences, index); + let hashes = Self::get_hashes( + name, + index, + Some(url), + &version_id, + version, + preferences, + in_memory, + ); // Extract the metadata. let metadata = { - let response = index.distributions().get(&version_id).unwrap_or_else(|| { - panic!("Every URL distribution should have metadata: {version_id:?}") - }); + let response = in_memory + .distributions() + .get(&version_id) + .unwrap_or_else(|| { + panic!("Every URL distribution should have metadata: {version_id:?}") + }); let MetadataResponse::Found(archive) = &*response else { panic!("Every URL distribution should have metadata: {version_id:?}") @@ -449,17 +466,28 @@ impl ResolutionGraph { } // Extract the hashes. - let hashes = Self::get_hashes(name, None, &version_id, version, preferences, index); + let hashes = Self::get_hashes( + name, + index, + None, + &version_id, + version, + preferences, + in_memory, + ); // Extract the metadata. let metadata = { - index.distributions().get(&version_id).and_then(|response| { - if let MetadataResponse::Found(archive) = &*response { - Some(archive.metadata.clone()) - } else { - None - } - }) + in_memory + .distributions() + .get(&version_id) + .and_then(|response| { + if let MetadataResponse::Found(archive) = &*response { + Some(archive.metadata.clone()) + } else { + None + } + }) }; (dist, hashes, metadata) @@ -470,11 +498,12 @@ impl ResolutionGraph { /// lockfile. fn get_hashes( name: &PackageName, + index: Option<&IndexUrl>, url: Option<&VerbatimParsedUrl>, version_id: &VersionId, version: &Version, preferences: &Preferences, - index: &InMemoryIndex, + in_memory: &InMemoryIndex, ) -> Vec { // 1. Look for hashes from the lockfile. if let Some(digests) = preferences.match_hashes(name, version) { @@ -484,7 +513,7 @@ impl ResolutionGraph { } // 2. Look for hashes for the distribution (i.e., the specific wheel or source distribution). - if let Some(metadata_response) = index.distributions().get(version_id) { + if let Some(metadata_response) = in_memory.distributions().get(version_id) { if let MetadataResponse::Found(ref archive) = *metadata_response { let mut digests = archive.hashes.clone(); digests.sort_unstable(); @@ -496,7 +525,13 @@ impl ResolutionGraph { // 3. Look for hashes from the registry, which are served at the package level. if url.is_none() { - if let Some(versions_response) = index.packages().get(name) { + let versions_response = if let Some(index) = index { + in_memory.explicit().get(&(name.clone(), index.clone())) + } else { + in_memory.implicit().get(name) + }; + + if let Some(versions_response) = versions_response { if let VersionsResponse::Found(ref version_maps) = *versions_response { if let Some(digests) = version_maps .iter() diff --git a/crates/uv-resolver/src/resolver/batch_prefetch.rs b/crates/uv-resolver/src/resolver/batch_prefetch.rs index c23a9717b008..96ecda180993 100644 --- a/crates/uv-resolver/src/resolver/batch_prefetch.rs +++ b/crates/uv-resolver/src/resolver/batch_prefetch.rs @@ -6,7 +6,7 @@ use rustc_hash::FxHashMap; use tokio::sync::mpsc::Sender; use tracing::{debug, trace}; -use distribution_types::{CompatibleDist, DistributionMetadata, IndexCapabilities}; +use distribution_types::{CompatibleDist, DistributionMetadata, IndexCapabilities, IndexUrl}; use pep440_rs::Version; use crate::candidate_selector::CandidateSelector; @@ -47,11 +47,12 @@ impl BatchPrefetcher { pub(crate) fn prefetch_batches( &mut self, next: &PubGrubPackage, + index: Option<&IndexUrl>, version: &Version, current_range: &Range, python_requirement: &PythonRequirement, request_sink: &Sender, - index: &InMemoryIndex, + in_memory: &InMemoryIndex, capabilities: &IndexCapabilities, selector: &CandidateSelector, markers: &ResolverMarkers, @@ -73,10 +74,17 @@ impl BatchPrefetcher { let total_prefetch = min(num_tried, 50); // This is immediate, we already fetched the version map. - let versions_response = index - .packages() - .wait_blocking(name) - .ok_or_else(|| ResolveError::UnregisteredTask(name.to_string()))?; + let versions_response = if let Some(index) = index { + in_memory + .explicit() + .wait_blocking(&(name.clone(), index.clone())) + .ok_or_else(|| ResolveError::UnregisteredTask(name.to_string()))? + } else { + in_memory + .implicit() + .wait_blocking(name) + .ok_or_else(|| ResolveError::UnregisteredTask(name.to_string()))? + }; let VersionsResponse::Found(ref version_map) = *versions_response else { return Ok(()); @@ -191,7 +199,7 @@ impl BatchPrefetcher { ); prefetch_count += 1; - if index.distributions().register(candidate.version_id()) { + if in_memory.distributions().register(candidate.version_id()) { let request = Request::from(dist); request_sink.blocking_send(request)?; } diff --git a/crates/uv-resolver/src/resolver/fork_map.rs b/crates/uv-resolver/src/resolver/fork_map.rs index 907c36b9b4ad..0be5fc8e2886 100644 --- a/crates/uv-resolver/src/resolver/fork_map.rs +++ b/crates/uv-resolver/src/resolver/fork_map.rs @@ -44,6 +44,11 @@ impl ForkMap { !self.get(package_name, markers).is_empty() } + /// Returns `true` if the map contains any values for a package. + pub(crate) fn contains_key(&self, package_name: &PackageName) -> bool { + self.0.contains_key(package_name) + } + /// Returns a list of values associated with a package that are compatible with the given fork. /// /// Compatibility implies that the markers on the requirement that contained this value diff --git a/crates/uv-resolver/src/resolver/index.rs b/crates/uv-resolver/src/resolver/index.rs index 24e52c477a31..4551fcdff294 100644 --- a/crates/uv-resolver/src/resolver/index.rs +++ b/crates/uv-resolver/src/resolver/index.rs @@ -1,7 +1,7 @@ use std::hash::BuildHasherDefault; use std::sync::Arc; -use distribution_types::VersionId; +use distribution_types::{IndexUrl, VersionId}; use once_map::OnceMap; use rustc_hash::FxHasher; use uv_normalize::PackageName; @@ -16,7 +16,9 @@ pub struct InMemoryIndex(Arc); struct SharedInMemoryIndex { /// A map from package name to the metadata for that package and the index where the metadata /// came from. - packages: FxOnceMap>, + implicit: FxOnceMap>, + + explicit: FxOnceMap<(PackageName, IndexUrl), Arc>, /// A map from package ID to metadata for that distribution. distributions: FxOnceMap>, @@ -26,8 +28,13 @@ pub(crate) type FxOnceMap = OnceMap>; impl InMemoryIndex { /// Returns a reference to the package metadata map. - pub fn packages(&self) -> &FxOnceMap> { - &self.0.packages + pub fn implicit(&self) -> &FxOnceMap> { + &self.0.implicit + } + + /// Returns a reference to the package metadata map. + pub fn explicit(&self) -> &FxOnceMap<(PackageName, IndexUrl), Arc> { + &self.0.explicit } /// Returns a reference to the distribution metadata map. diff --git a/crates/uv-resolver/src/resolver/indexes.rs b/crates/uv-resolver/src/resolver/indexes.rs index 1a0b94c2b3ec..1187a8c7ee5e 100644 --- a/crates/uv-resolver/src/resolver/indexes.rs +++ b/crates/uv-resolver/src/resolver/indexes.rs @@ -1,9 +1,8 @@ -use crate::{DependencyMode, Manifest, ResolveError, ResolverMarkers}; +use crate::resolver::ForkMap; +use crate::{DependencyMode, Manifest, ResolverMarkers}; use distribution_types::IndexUrl; use pep508_rs::{PackageName, VerbatimUrl}; use pypi_types::RequirementSource; -use rustc_hash::FxHashMap; -use std::collections::hash_map::Entry; /// A map of package names to their explicit index. /// @@ -19,7 +18,7 @@ use std::collections::hash_map::Entry; /// /// [`Indexes`] would contain a single entry mapping `torch` to `https://download.pytorch.org/whl/cu121`. #[derive(Debug, Default, Clone)] -pub(crate) struct Indexes(FxHashMap); +pub(crate) struct Indexes(ForkMap); impl Indexes { /// Determine the set of explicit, pinned indexes in the [`Manifest`]. @@ -27,8 +26,8 @@ impl Indexes { manifest: &Manifest, markers: &ResolverMarkers, dependencies: DependencyMode, - ) -> Result { - let mut indexes = FxHashMap::::default(); + ) -> Self { + let mut indexes = ForkMap::default(); for requirement in manifest.requirements(markers, dependencies) { let RequirementSource::Registry { @@ -38,28 +37,23 @@ impl Indexes { continue; }; let index = IndexUrl::from(VerbatimUrl::from_url(index.clone())); - match indexes.entry(requirement.name.clone()) { - Entry::Occupied(entry) => { - let existing = entry.get(); - if *existing != index { - return Err(ResolveError::ConflictingIndexes( - requirement.name.clone(), - existing.to_string(), - index.to_string(), - )); - } - } - Entry::Vacant(entry) => { - entry.insert(index); - } - } + indexes.add(&requirement, index); } - Ok(Self(indexes)) + Self(indexes) } - /// Return the explicit index for a given [`PackageName`]. - pub(crate) fn get(&self, package_name: &PackageName) -> Option<&IndexUrl> { - self.0.get(package_name) + /// Returns `true` if the map contains any indexes for a package. + pub(crate) fn contains_key(&self, name: &PackageName) -> bool { + self.0.contains_key(name) + } + + /// Return the explicit index used for a package in the given fork. + pub(crate) fn get( + &self, + package_name: &PackageName, + markers: &ResolverMarkers, + ) -> Vec<&IndexUrl> { + self.0.get(package_name, markers) } } diff --git a/crates/uv-resolver/src/resolver/mod.rs b/crates/uv-resolver/src/resolver/mod.rs index 3952e02005c6..b5cc86894756 100644 --- a/crates/uv-resolver/src/resolver/mod.rs +++ b/crates/uv-resolver/src/resolver/mod.rs @@ -44,6 +44,7 @@ use uv_warnings::warn_user_once; use crate::candidate_selector::{CandidateDist, CandidateSelector}; use crate::dependency_provider::UvDependencyProvider; use crate::error::{NoSolutionError, ResolveError}; +use crate::fork_indexes::ForkIndexes; use crate::fork_urls::ForkUrls; use crate::manifest::Manifest; use crate::pins::FilePins; @@ -205,7 +206,7 @@ impl dependency_mode: options.dependency_mode, urls: Urls::from_manifest(&manifest, &markers, git, options.dependency_mode)?, locals: Locals::from_manifest(&manifest, &markers, options.dependency_mode), - indexes: Indexes::from_manifest(&manifest, &markers, options.dependency_mode)?, + indexes: Indexes::from_manifest(&manifest, &markers, options.dependency_mode), groups: Groups::from_manifest(&manifest, &markers), project: manifest.project, workspace_members: manifest.workspace_members, @@ -333,6 +334,7 @@ impl ResolverState ResolverState ResolverState ResolverState ResolverState ResolverState ResolverState ResolverState ResolverState ResolverState ResolverState( packages: impl Iterator)>, urls: &Urls, + indexes: &Indexes, python_requirement: &PythonRequirement, request_sink: &Sender, ) -> Result<(), ResolveError> { @@ -801,6 +824,10 @@ impl ResolverState ResolverState, range: &Range, pins: &mut FilePins, preferences: &Preferences, @@ -846,8 +874,10 @@ impl ResolverState ResolverState, range: &Range, package: &PubGrubPackage, preferences: &Preferences, @@ -973,11 +1004,17 @@ impl ResolverState, ) -> Result, ResolveError> { // Wait for the metadata to be available. - let versions_response = self - .index - .packages() - .wait_blocking(name) - .ok_or_else(|| ResolveError::UnregisteredTask(name.to_string()))?; + let versions_response = if let Some(index) = index { + self.index + .explicit() + .wait_blocking(&(name.clone(), index.clone())) + .ok_or_else(|| ResolveError::UnregisteredTask(name.to_string()))? + } else { + self.index + .implicit() + .wait_blocking(name) + .ok_or_else(|| ResolveError::UnregisteredTask(name.to_string()))? + }; visited.insert(name.clone()); let version_maps = match *versions_response { @@ -1653,11 +1690,15 @@ impl ResolverState { - trace!("Received package metadata for: {package_name}"); - self.index - .packages() - .done(package_name, Arc::new(version_map)); + Some(Response::Package(name, index, version_map)) => { + trace!("Received package metadata for: {name}"); + if let Some(index) = index { + self.index + .explicit() + .done((name, index), Arc::new(version_map)); + } else { + self.index.implicit().done(name, Arc::new(version_map)); + } } Some(Response::Installed { dist, metadata }) => { trace!("Received installed distribution metadata for: {dist}"); @@ -1726,7 +1767,11 @@ impl ResolverState ResolverState ResolverState, fork_urls: ForkUrls, + fork_indexes: &ForkIndexes, markers: ResolverMarkers, visited: &FxHashSet, index_locations: &IndexLocations, @@ -1964,7 +2010,12 @@ impl ResolverState, version: &Version, urls: &Urls, + indexes: &Indexes, locals: &Locals, mut dependencies: Vec, git: &GitResolver, @@ -2168,6 +2226,11 @@ impl ForkState { *version = version.union(&local); } } + + // If the package is pinned to an exact index, add it to the fork. + for index in indexes.get(name, &self.markers) { + self.fork_indexes.insert(name, index, &self.markers)?; + } } if let Some(for_package) = for_package { @@ -2317,6 +2380,9 @@ impl ForkState { _ => continue, }; let self_url = self_name.as_ref().and_then(|name| self.fork_urls.get(name)); + let self_index = self_name + .as_ref() + .and_then(|name| self.fork_indexes.get(name)); match **dependency_package { PubGrubPackageInner::Package { @@ -2329,15 +2395,18 @@ impl ForkState { continue; } let to_url = self.fork_urls.get(dependency_name); + let to_index = self.fork_indexes.get(dependency_name); let edge = ResolutionDependencyEdge { from: self_name.cloned(), from_version: self_version.clone(), from_url: self_url.cloned(), + from_index: self_index.cloned(), from_extra: self_extra.cloned(), from_dev: self_dev.cloned(), to: dependency_name.clone(), to_version: dependency_version.clone(), to_url: to_url.cloned(), + to_index: to_index.cloned(), to_extra: dependency_extra.clone(), to_dev: dependency_dev.clone(), marker: MarkerTree::TRUE, @@ -2354,15 +2423,18 @@ impl ForkState { continue; } let to_url = self.fork_urls.get(dependency_name); + let to_index = self.fork_indexes.get(dependency_name); let edge = ResolutionDependencyEdge { from: self_name.cloned(), from_version: self_version.clone(), from_url: self_url.cloned(), + from_index: self_index.cloned(), from_extra: self_extra.cloned(), from_dev: self_dev.cloned(), to: dependency_name.clone(), to_version: dependency_version.clone(), to_url: to_url.cloned(), + to_index: to_index.cloned(), to_extra: None, to_dev: None, marker: dependency_marker.clone(), @@ -2380,15 +2452,18 @@ impl ForkState { continue; } let to_url = self.fork_urls.get(dependency_name); + let to_index = self.fork_indexes.get(dependency_name); let edge = ResolutionDependencyEdge { from: self_name.cloned(), from_version: self_version.clone(), from_url: self_url.cloned(), + from_index: self_index.cloned(), from_extra: self_extra.cloned(), from_dev: self_dev.cloned(), to: dependency_name.clone(), to_version: dependency_version.clone(), to_url: to_url.cloned(), + to_index: to_index.cloned(), to_extra: Some(dependency_extra.clone()), to_dev: None, marker: MarkerTree::from(dependency_marker.clone()), @@ -2406,15 +2481,18 @@ impl ForkState { continue; } let to_url = self.fork_urls.get(dependency_name); + let to_index = self.fork_indexes.get(dependency_name); let edge = ResolutionDependencyEdge { from: self_name.cloned(), from_version: self_version.clone(), from_url: self_url.cloned(), + from_index: self_index.cloned(), from_extra: self_extra.cloned(), from_dev: self_dev.cloned(), to: dependency_name.clone(), to_version: dependency_version.clone(), to_url: to_url.cloned(), + to_index: to_index.cloned(), to_extra: None, to_dev: Some(dependency_dev.clone()), marker: MarkerTree::from(dependency_marker.clone()), @@ -2443,6 +2521,7 @@ impl ForkState { extra: extra.clone(), dev: dev.clone(), url: self.fork_urls.get(name).cloned(), + index: self.fork_indexes.get(name).cloned(), }, version, )) @@ -2483,6 +2562,9 @@ pub(crate) struct ResolutionPackage { pub(crate) dev: Option, /// For index packages, this is `None`. pub(crate) url: Option, + /// For URL packages, this is `None`, and is only `Some` for packages that are pinned to a + /// specific index via `tool.uv.sources`. + pub(crate) index: Option, } /// The `from_` fields and the `to_` fields allow mapping to the originating and target @@ -2493,11 +2575,13 @@ pub(crate) struct ResolutionDependencyEdge { pub(crate) from: Option, pub(crate) from_version: Version, pub(crate) from_url: Option, + pub(crate) from_index: Option, pub(crate) from_extra: Option, pub(crate) from_dev: Option, pub(crate) to: PackageName, pub(crate) to_version: Version, pub(crate) to_url: Option, + pub(crate) to_index: Option, pub(crate) to_extra: Option, pub(crate) to_dev: Option, pub(crate) marker: MarkerTree, @@ -2583,7 +2667,7 @@ impl Display for Request { #[allow(clippy::large_enum_variant)] enum Response { /// The returned metadata for a package hosted on a registry. - Package(PackageName, VersionsResponse), + Package(PackageName, Option, VersionsResponse), /// The returned metadata for a distribution. Dist { dist: Dist, diff --git a/crates/uv-workspace/src/pyproject.rs b/crates/uv-workspace/src/pyproject.rs index c7201d53cec3..1d6d3d05cec3 100644 --- a/crates/uv-workspace/src/pyproject.rs +++ b/crates/uv-workspace/src/pyproject.rs @@ -523,16 +523,6 @@ impl TryFrom for Sources { return Err(SourceError::EmptySources); } - // Ensure that there is at most one registry source. - if sources - .iter() - .filter(|source| matches!(source, Source::Registry { .. })) - .nth(1) - .is_some() - { - return Err(SourceError::MultipleIndexes); - } - Ok(Self(sources)) } } @@ -635,8 +625,6 @@ pub enum SourceError { OverlappingMarkers(String, String, String), #[error("Must provide at least one source")] EmptySources, - #[error("Sources can only include a single index source")] - MultipleIndexes, } impl Source { diff --git a/crates/uv/tests/lock.rs b/crates/uv/tests/lock.rs index a220792f8618..a46d5220647d 100644 --- a/crates/uv/tests/lock.rs +++ b/crates/uv/tests/lock.rs @@ -13900,7 +13900,6 @@ fn lock_multiple_sources_conflict() -> Result<()> { Ok(()) } -/// Multiple `index` entries is not yet supported. #[test] fn lock_multiple_sources_index() -> Result<()> { let context = TestContext::new("3.12"); @@ -13912,34 +13911,397 @@ fn lock_multiple_sources_index() -> Result<()> { name = "project" version = "0.1.0" requires-python = ">=3.12" - dependencies = ["iniconfig"] + dependencies = ["jinja2>=3"] [tool.uv.sources] - iniconfig = [ - { index = "pytorch", marker = "sys_platform != 'win32'" }, - { index = "internal", marker = "sys_platform == 'win32'" }, + jinja2 = [ + { index = "torch-cu118", marker = "sys_platform == 'win32'"}, + { index = "torch-cu124", marker = "sys_platform != 'win32'"}, ] + + [[tool.uv.index]] + name = "torch-cu118" + url = "https://download.pytorch.org/whl/cu118" + + [[tool.uv.index]] + name = "torch-cu124" + url = "https://download.pytorch.org/whl/cu124" "#, )?; - uv_snapshot!(context.filters(), context.lock(), @r###" + uv_snapshot!(context.filters(), context.lock().env_remove("UV_EXCLUDE_NEWER"), @r###" + success: true + exit_code: 0 + ----- stdout ----- + + ----- stderr ----- + Resolved 4 packages in [TIME] + "###); + + let lock = fs_err::read_to_string(context.temp_dir.join("uv.lock")).unwrap(); + + insta::with_settings!({ + filters => context.filters(), + }, { + assert_snapshot!( + lock, @r###" + version = 1 + requires-python = ">=3.12" + resolution-markers = [ + "sys_platform == 'win32'", + "sys_platform != 'win32'", + ] + + [[package]] + name = "jinja2" + version = "3.1.3" + source = { registry = "https://download.pytorch.org/whl/cu118" } + dependencies = [ + { name = "markupsafe", marker = "sys_platform == 'win32'" }, + ] + wheels = [ + { url = "https://download.pytorch.org/whl/Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa" }, + ] + + [[package]] + name = "jinja2" + version = "3.1.3" + source = { registry = "https://download.pytorch.org/whl/cu124" } + dependencies = [ + { name = "markupsafe", marker = "sys_platform != 'win32'" }, + ] + wheels = [ + { url = "https://download.pytorch.org/whl/Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa" }, + ] + + [[package]] + name = "markupsafe" + version = "2.1.5" + source = { registry = "https://download.pytorch.org/whl/cu118" } + wheels = [ + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-win_amd64.whl", hash = "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb" }, + ] + + [[package]] + name = "project" + version = "0.1.0" + source = { virtual = "." } + dependencies = [ + { name = "jinja2", version = "3.1.3", source = { registry = "https://download.pytorch.org/whl/cu118" }, marker = "sys_platform == 'win32'" }, + { name = "jinja2", version = "3.1.3", source = { registry = "https://download.pytorch.org/whl/cu124" }, marker = "sys_platform != 'win32'" }, + ] + + [package.metadata] + requires-dist = [ + { name = "jinja2", marker = "sys_platform != 'win32'", specifier = ">=3", index = "https://download.pytorch.org/whl/cu124" }, + { name = "jinja2", marker = "sys_platform == 'win32'", specifier = ">=3", index = "https://download.pytorch.org/whl/cu118" }, + ] + "### + ); + }); + + // Re-run with `--locked`. + uv_snapshot!(context.filters(), context.lock().arg("--locked").env_remove("UV_EXCLUDE_NEWER"), @r###" + success: true + exit_code: 0 + ----- stdout ----- + + ----- stderr ----- + Resolved 4 packages in [TIME] + "###); + + Ok(()) +} + +#[test] +fn lock_multiple_sources_index_mixed() -> Result<()> { + let context = TestContext::new("3.12"); + + let pyproject_toml = context.temp_dir.child("pyproject.toml"); + pyproject_toml.write_str( + r#" + [project] + name = "project" + version = "0.1.0" + requires-python = ">=3.12" + dependencies = ["jinja2>=3"] + + [tool.uv.sources] + jinja2 = [ + { index = "torch-cu118", marker = "sys_platform == 'win32'"}, + { url = "https://files.pythonhosted.org/packages/31/80/3a54838c3fb461f6fec263ebf3a3a41771bd05190238de3486aae8540c36/jinja2-3.1.4-py3-none-any.whl", marker = "sys_platform != 'win32'"}, + ] + + [[tool.uv.index]] + name = "torch-cu118" + url = "https://download.pytorch.org/whl/cu118" + "#, + )?; + + uv_snapshot!(context.filters(), context.lock().env_remove("UV_EXCLUDE_NEWER"), @r###" + success: true + exit_code: 0 + ----- stdout ----- + + ----- stderr ----- + Resolved 4 packages in [TIME] + "###); + + let lock = fs_err::read_to_string(context.temp_dir.join("uv.lock")).unwrap(); + + insta::with_settings!({ + filters => context.filters(), + }, { + assert_snapshot!( + lock, @r###" + version = 1 + requires-python = ">=3.12" + resolution-markers = [ + "sys_platform == 'win32'", + "sys_platform != 'win32'", + ] + + [[package]] + name = "jinja2" + version = "3.1.3" + source = { registry = "https://download.pytorch.org/whl/cu118" } + resolution-markers = [ + "sys_platform == 'win32'", + ] + dependencies = [ + { name = "markupsafe", marker = "sys_platform == 'win32'" }, + ] + wheels = [ + { url = "https://download.pytorch.org/whl/Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa" }, + ] + + [[package]] + name = "jinja2" + version = "3.1.4" + source = { url = "https://files.pythonhosted.org/packages/31/80/3a54838c3fb461f6fec263ebf3a3a41771bd05190238de3486aae8540c36/jinja2-3.1.4-py3-none-any.whl" } + resolution-markers = [ + "sys_platform != 'win32'", + ] + dependencies = [ + { name = "markupsafe", marker = "sys_platform != 'win32'" }, + ] + wheels = [ + { url = "https://files.pythonhosted.org/packages/31/80/3a54838c3fb461f6fec263ebf3a3a41771bd05190238de3486aae8540c36/jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d" }, + ] + + [package.metadata] + requires-dist = [ + { name = "babel", marker = "extra == 'i18n'", specifier = ">=2.7" }, + { name = "markupsafe", specifier = ">=2.0" }, + ] + + [[package]] + name = "markupsafe" + version = "2.1.5" + source = { registry = "https://download.pytorch.org/whl/cu118" } + wheels = [ + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b" }, + { url = "https://download.pytorch.org/whl/MarkupSafe-2.1.5-cp312-cp312-win_amd64.whl", hash = "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb" }, + ] + + [[package]] + name = "project" + version = "0.1.0" + source = { virtual = "." } + dependencies = [ + { name = "jinja2", version = "3.1.3", source = { registry = "https://download.pytorch.org/whl/cu118" }, marker = "sys_platform == 'win32'" }, + { name = "jinja2", version = "3.1.4", source = { url = "https://files.pythonhosted.org/packages/31/80/3a54838c3fb461f6fec263ebf3a3a41771bd05190238de3486aae8540c36/jinja2-3.1.4-py3-none-any.whl" }, marker = "sys_platform != 'win32'" }, + ] + + [package.metadata] + requires-dist = [ + { name = "jinja2", marker = "sys_platform != 'win32'", url = "https://files.pythonhosted.org/packages/31/80/3a54838c3fb461f6fec263ebf3a3a41771bd05190238de3486aae8540c36/jinja2-3.1.4-py3-none-any.whl" }, + { name = "jinja2", marker = "sys_platform == 'win32'", specifier = ">=3", index = "https://download.pytorch.org/whl/cu118" }, + ] + "### + ); + }); + + // Re-run with `--locked`. + uv_snapshot!(context.filters(), context.lock().arg("--locked").env_remove("UV_EXCLUDE_NEWER"), @r###" + success: true + exit_code: 0 + ----- stdout ----- + + ----- stderr ----- + Resolved 4 packages in [TIME] + "###); + + Ok(()) +} + +#[test] +fn lock_multiple_sources_index_non_total() -> Result<()> { + let context = TestContext::new("3.12"); + + let pyproject_toml = context.temp_dir.child("pyproject.toml"); + pyproject_toml.write_str( + r#" + [project] + name = "project" + version = "0.1.0" + requires-python = ">=3.12" + dependencies = ["jinja2>=3"] + + [tool.uv.sources] + jinja2 = [ + { index = "torch-cu118", marker = "sys_platform == 'win32'"}, + ] + + [[tool.uv.index]] + name = "torch-cu118" + url = "https://download.pytorch.org/whl/cu118" + "#, + )?; + + uv_snapshot!(context.filters(), context.lock().env_remove("UV_EXCLUDE_NEWER"), @r###" success: false exit_code: 2 ----- stdout ----- ----- stderr ----- - error: Failed to parse: `pyproject.toml` - Caused by: TOML parse error at line 9, column 21 - | - 9 | iniconfig = [ - | ^ - Sources can only include a single index source + Resolved 4 packages in [TIME] + error: found duplicate package `jinja2==3.1.3 @ registry+https://download.pytorch.org/whl/cu118` + "###); + + Ok(()) +} + +#[test] +fn lock_multiple_sources_index_explicit() -> Result<()> { + let context = TestContext::new("3.12"); + + let pyproject_toml = context.temp_dir.child("pyproject.toml"); + pyproject_toml.write_str( + r#" + [project] + name = "project" + version = "0.1.0" + requires-python = ">=3.12" + dependencies = ["jinja2>=3"] + + [tool.uv.sources] + jinja2 = [ + { index = "torch-cu118", marker = "sys_platform == 'win32'"}, + ] + + [[tool.uv.index]] + name = "torch-cu118" + url = "https://download.pytorch.org/whl/cu118" + explicit = true + "#, + )?; + + uv_snapshot!(context.filters(), context.lock().env_remove("UV_EXCLUDE_NEWER"), @r###" + success: true + exit_code: 0 + ----- stdout ----- + + ----- stderr ----- + Resolved 4 packages in [TIME] + "###); + + let lock = fs_err::read_to_string(context.temp_dir.join("uv.lock")).unwrap(); + + insta::with_settings!({ + filters => context.filters(), + }, { + assert_snapshot!( + lock, @r###" + version = 1 + requires-python = ">=3.12" + resolution-markers = [ + "sys_platform == 'win32'", + "sys_platform != 'win32'", + ] + [[package]] + name = "jinja2" + version = "3.1.3" + source = { registry = "https://download.pytorch.org/whl/cu118" } + dependencies = [ + { name = "markupsafe", marker = "sys_platform == 'win32'" }, + ] + wheels = [ + { url = "https://download.pytorch.org/whl/Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa" }, + ] + + [[package]] + name = "jinja2" + version = "3.1.3" + source = { registry = "https://pypi.org/simple" } + dependencies = [ + { name = "markupsafe", marker = "sys_platform != 'win32'" }, + ] + sdist = { url = "https://files.pythonhosted.org/packages/b2/5e/3a21abf3cd467d7876045335e681d276ac32492febe6d98ad89562d1a7e1/Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90", size = 268261 } + wheels = [ + { url = "https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa", size = 133236 }, + ] + + [[package]] + name = "markupsafe" + version = "2.1.5" + source = { registry = "https://pypi.org/simple" } + sdist = { url = "https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz", hash = "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b", size = 19384 } + wheels = [ + { url = "https://files.pythonhosted.org/packages/53/bd/583bf3e4c8d6a321938c13f49d44024dbe5ed63e0a7ba127e454a66da974/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1", size = 18215 }, + { url = "https://files.pythonhosted.org/packages/48/d6/e7cd795fc710292c3af3a06d80868ce4b02bfbbf370b7cee11d282815a2a/MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4", size = 14069 }, + { url = "https://files.pythonhosted.org/packages/51/b5/5d8ec796e2a08fc814a2c7d2584b55f889a55cf17dd1a90f2beb70744e5c/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee", size = 29452 }, + { url = "https://files.pythonhosted.org/packages/0a/0d/2454f072fae3b5a137c119abf15465d1771319dfe9e4acbb31722a0fff91/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5", size = 28462 }, + { url = "https://files.pythonhosted.org/packages/2d/75/fd6cb2e68780f72d47e6671840ca517bda5ef663d30ada7616b0462ad1e3/MarkupSafe-2.1.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b", size = 27869 }, + { url = "https://files.pythonhosted.org/packages/b0/81/147c477391c2750e8fc7705829f7351cf1cd3be64406edcf900dc633feb2/MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a", size = 33906 }, + { url = "https://files.pythonhosted.org/packages/8b/ff/9a52b71839d7a256b563e85d11050e307121000dcebc97df120176b3ad93/MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f", size = 32296 }, + { url = "https://files.pythonhosted.org/packages/88/07/2dc76aa51b481eb96a4c3198894f38b480490e834479611a4053fbf08623/MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169", size = 33038 }, + { url = "https://files.pythonhosted.org/packages/96/0c/620c1fb3661858c0e37eb3cbffd8c6f732a67cd97296f725789679801b31/MarkupSafe-2.1.5-cp312-cp312-win32.whl", hash = "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad", size = 16572 }, + { url = "https://files.pythonhosted.org/packages/3f/14/c3554d512d5f9100a95e737502f4a2323a1959f6d0d01e0d0997b35f7b10/MarkupSafe-2.1.5-cp312-cp312-win_amd64.whl", hash = "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb", size = 17127 }, + ] + + [[package]] + name = "project" + version = "0.1.0" + source = { virtual = "." } + dependencies = [ + { name = "jinja2", version = "3.1.3", source = { registry = "https://download.pytorch.org/whl/cu118" }, marker = "sys_platform == 'win32'" }, + { name = "jinja2", version = "3.1.3", source = { registry = "https://pypi.org/simple" }, marker = "sys_platform != 'win32'" }, + ] + + [package.metadata] + requires-dist = [ + { name = "jinja2", marker = "sys_platform != 'win32'", specifier = ">=3" }, + { name = "jinja2", marker = "sys_platform == 'win32'", specifier = ">=3", index = "https://download.pytorch.org/whl/cu118" }, + ] + "### + ); + }); + + // Re-run with `--locked`. + uv_snapshot!(context.filters(), context.lock().arg("--locked").env_remove("UV_EXCLUDE_NEWER"), @r###" + success: true + exit_code: 0 + ----- stdout ----- + + ----- stderr ----- + Resolved 4 packages in [TIME] "###); Ok(()) } + #[test] fn lock_multiple_sources_non_total() -> Result<()> { let context = TestContext::new("3.12");