Reverts

astral-sh · Dec 7, 2024 · 52b10c6 · 52b10c6
1 parent cb52f74
commit 52b10c6
Show file tree

Hide file tree

Showing 19 changed files with 552 additions and 89 deletions.
diff --git a/crates/uv-resolver/src/pubgrub/dependencies.rs b/crates/uv-resolver/src/pubgrub/dependencies.rs
@@ -2,7 +2,6 @@ use std::iter;
 
 use either::Either;
 use pubgrub::Ranges;
-use tracing::warn;
 
 use uv_normalize::{ExtraName, GroupName, PackageName};
 use uv_pep440::{Version, VersionSpecifiers};
@@ -91,28 +90,23 @@ impl PubGrubDependency {
 
         // Add the package, plus any extra variants.
         iter.map(|(extra, group)| PubGrubRequirement::from_requirement(requirement, extra, group))
-            .filter_map(move |requirement| {
+            .map(move |requirement| {
                 let PubGrubRequirement {
                     package,
                     version,
                     url,
                 } = requirement;
                 match &*package {
-                    PubGrubPackageInner::Package { name, .. } => {
-
-                        Some(PubGrubDependency {
-                            package: package.clone(),
-                            version: version.clone(),
-                            url,
-                        })
-                    }
-                    PubGrubPackageInner::Marker { name, .. } => {
-                        Some(PubGrubDependency {
-                            package: package.clone(),
-                            version: version.clone(),
-                            url,
-                        })
-                    }
+                    PubGrubPackageInner::Package { .. } => PubGrubDependency {
+                        package: package.clone(),
+                        version: version.clone(),
+                        url,
+                    },
+                    PubGrubPackageInner::Marker { .. } => PubGrubDependency {
+                        package: package.clone(),
+                        version: version.clone(),
+                        url,
+                    },
                     PubGrubPackageInner::Extra { name, .. } => {
                         // Detect self-dependencies.
                         if dev.is_none() {
@@ -121,11 +115,11 @@ impl PubGrubDependency {
                                 "extras not flattened for {name}"
                             );
                         }
-                        Some(PubGrubDependency {
+                        PubGrubDependency {
                             package: package.clone(),
                             version: version.clone(),
                             url,
-                        })
+                        }
                     }
                     PubGrubPackageInner::Dev { name, .. } => {
                         // Detect self-dependencies.
@@ -135,11 +129,11 @@ impl PubGrubDependency {
                                 "group not flattened for {name}"
                             );
                         }
-                        Some(PubGrubDependency {
+                        PubGrubDependency {
                             package: package.clone(),
                             version: version.clone(),
                             url,
-                        })
+                        }
                     }
                     PubGrubPackageInner::Root(_) => unreachable!("root package in dependencies"),
                     PubGrubPackageInner::Python(_) => {

diff --git a/crates/uv-resolver/src/pubgrub/report.rs b/crates/uv-resolver/src/pubgrub/report.rs
@@ -133,6 +133,16 @@ impl ReportFormatter<PubGrubPackage, Range<Version>, UnavailableReason>
             External::FromDependencyOf(package, package_set, dependency, dependency_set) => {
                 let package_set = self.simplify_set(package_set, package);
                 let dependency_set = self.simplify_set(dependency_set, dependency);
+
+                if package == dependency {
+                    if let Some(member) = self.format_workspace_member(package) {
+                        return format!(
+                            "{member} depends on itself at an incompatible version ({})",
+                            PackageRange::dependency(package, &dependency_set, None)
+                        );
+                    }
+                }
+
                 if let Some(root) = self.format_root_requires(package) {
                     return format!(
                         "{root} {}",
@@ -407,6 +417,24 @@ impl PubGrubReportFormatter<'_> {
         }
     }
 
+    /// Return whether the given package is the root package.
+    fn is_root(package: &PubGrubPackage) -> bool {
+        matches!(&**package, PubGrubPackageInner::Root(_))
+    }
+
+    /// Return whether the given package is a workspace member.
+    fn is_single_project_workspace_member(&self, package: &PubGrubPackage) -> bool {
+        match &**package {
+            // TODO(zanieb): Improve handling of dev and extra for single-project workspaces
+            PubGrubPackageInner::Package {
+                name, extra, dev, ..
+            } if self.workspace_members.contains(name) => {
+                self.is_single_project_workspace() && extra.is_none() && dev.is_none()
+            }
+            _ => false,
+        }
+    }
+
     /// Create a [`PackageRange::compatibility`] display with this formatter attached.
     fn compatible_range<'a>(
         &'a self,
@@ -467,6 +495,18 @@ impl PubGrubReportFormatter<'_> {
                         .and(dependency2.package, &dependency_set2),
                 )
             }
+            (.., External::FromDependencyOf(package, _, dependency, _))
+                if Self::is_root(package)
+                    && self.is_single_project_workspace_member(dependency) =>
+            {
+                self.format_external(external1)
+            }
+            (External::FromDependencyOf(package, _, dependency, _), ..)
+                if Self::is_root(package)
+                    && self.is_single_project_workspace_member(dependency) =>
+            {
+                self.format_external(external2)
+            }
             _ => {
                 let external1 = self.format_external(external1);
                 let external2 = self.format_external(external2);

diff --git a/crates/uv-resolver/src/resolver/mod.rs b/crates/uv-resolver/src/resolver/mod.rs
@@ -2453,7 +2453,6 @@ impl ForkState {
                         extra: ref dependency_extra,
                         dev: ref dependency_dev,
                         marker: ref dependency_marker,
-                        ..
                     } => {
                         let to_url = self.fork_urls.get(dependency_name);
                         let to_index = self.fork_indexes.get(dependency_name);
@@ -2478,7 +2477,6 @@ impl ForkState {
                     PubGrubPackageInner::Marker {
                         name: ref dependency_name,
                         marker: ref dependency_marker,
-                        ..
                     } => {
                         let to_url = self.fork_urls.get(dependency_name);
                         let to_index = self.fork_indexes.get(dependency_name);
@@ -2504,7 +2502,6 @@ impl ForkState {
                         name: ref dependency_name,
                         extra: ref dependency_extra,
                         marker: ref dependency_marker,
-                        ..
                     } => {
                         // Insert an edge from the dependent package to the extra package.
                         let to_url = self.fork_urls.get(dependency_name);
@@ -2551,7 +2548,6 @@ impl ForkState {
                         name: ref dependency_name,
                         dev: ref dependency_dev,
                         marker: ref dependency_marker,
-                        ..
                     } => {
                         // Add an edge from the dependent package to the dev package, but _not_ the
                         // base package.