Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions crates/uv-resolver/src/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
&self.indexes,
dependencies.clone(),
&self.git,
&self.workspace_members,
self.selector.resolution_strategy(),
)?;

Expand Down Expand Up @@ -861,6 +862,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
&self.indexes,
fork.dependencies.clone(),
&self.git,
&self.workspace_members,
self.selector.resolution_strategy(),
)?;
// Emit a request to fetch the metadata for each registry package.
Expand Down Expand Up @@ -2498,6 +2500,7 @@ impl ForkState {
indexes: &Indexes,
dependencies: Vec<PubGrubDependency>,
git: &GitResolver,
workspace_members: &BTreeSet<PackageName>,
resolution_strategy: &ResolutionStrategy,
) -> Result<(), ResolveError> {
for dependency in &dependencies {
Expand All @@ -2524,12 +2527,15 @@ impl ForkState {
}
}

if let Some(name) = self.pubgrub.package_store[for_package].name_no_root() {
if let Some(name) = self.pubgrub.package_store[for_package]
.name_no_root()
.filter(|name| !workspace_members.contains(name))
{
debug!(
"Adding transitive dependency for {name}=={for_version}: {package}{version}"
);
} else {
// A dependency from the root package or requirements.txt.
// A dependency from the root package or `requirements.txt`.
debug!("Adding direct dependency: {package}{version}");

// Warn the user if a direct dependency lacks a lower bound in `--lowest` resolution.
Expand Down
5 changes: 3 additions & 2 deletions crates/uv/tests/it/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6957,7 +6957,7 @@ fn lock_same_version_multiple_urls() -> Result<()> {
Ok(())
}

/// When locking with `--resolution-mode=lowest`, we shouldn't warn on unbounded direct
/// When locking with `--resolution-mode=lowest`, we should warn on unbounded direct
/// dependencies.
#[test]
fn lock_unsafe_lowest() -> Result<()> {
Expand Down Expand Up @@ -6988,6 +6988,7 @@ fn lock_unsafe_lowest() -> Result<()> {
----- stdout -----

----- stderr -----
warning: The direct dependency `iniconfig` is unpinned. Consider setting a lower bound when using `--resolution lowest` to avoid using outdated versions.
Resolved 2 packages in [TIME]
"###);

Expand Down Expand Up @@ -14860,7 +14861,7 @@ fn lock_explicit_default_index() -> Result<()> {
DEBUG Solving with target Python version: >=3.12
DEBUG Adding direct dependency: project*
DEBUG Searching for a compatible version of project @ file://[TEMP_DIR]/ (*)
DEBUG Adding transitive dependency for project==0.1.0: anyio*
DEBUG Adding direct dependency: anyio*
DEBUG Searching for a compatible version of anyio (*)
DEBUG No compatible version found for: anyio
DEBUG Recording unit propagation conflict of anyio from incompatibility of (project)
Expand Down