Reverts

astral-sh · Dec 7, 2024 · a4d880c · a4d880c
1 parent 1acf1a5
commit a4d880c
Show file tree

Hide file tree

Showing 17 changed files with 509 additions and 84 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};
@@ -98,21 +97,16 @@ impl PubGrubDependency {
                     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 { .. } => Some(PubGrubDependency {
+                        package: package.clone(),
+                        version: version.clone(),
+                        url,
+                    }),
+                    PubGrubPackageInner::Marker { .. } => Some(PubGrubDependency {
+                        package: package.clone(),
+                        version: version.clone(),
+                        url,
+                    }),
                     PubGrubPackageInner::Extra { name, .. } => {
                         // Detect self-dependencies.
                         if dev.is_none() {

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,8 +2477,13 @@ impl ForkState {
                     PubGrubPackageInner::Marker {
                         name: ref dependency_name,
                         marker: ref dependency_marker,
-                        ..
                     } => {
+                        // Ignore self-dependencies. For example, `tensorflow-macos` depends on
+                        // `tensorflow-macos ; platform_machine == 'arm64' and platform_system == 'Darwin'.
+                        if self_name == Some(dependency_name) {
+                            continue;
+                        }
+
                         let to_url = self.fork_urls.get(dependency_name);
                         let to_index = self.fork_indexes.get(dependency_name);
                         let edge = ResolutionDependencyEdge {
@@ -2504,7 +2508,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 +2554,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.