Use correct ordering semantics for narrowing upper-bounded Python req…

…uirements (#7031) ## Summary We need to use different ordering semantics for upper and lower Python bounds. Closes #6911.
astral-sh · Sep 4, 2024 · 1ccc15e · 1ccc15e
1 parent 724a93b
commit 1ccc15e
Show file tree

Hide file tree

Showing 15 changed files with 627 additions and 115 deletions.
diff --git a/crates/uv-resolver/src/lib.rs b/crates/uv-resolver/src/lib.rs
@@ -12,9 +12,7 @@ pub use preferences::{Preference, PreferenceError, Preferences};
 pub use prerelease::PrereleaseMode;
 pub use pubgrub::{PubGrubSpecifier, PubGrubSpecifierError};
 pub use python_requirement::PythonRequirement;
-pub use requires_python::{
-    RequiresPython, RequiresPythonBound, RequiresPythonError, RequiresPythonRange,
-};
+pub use requires_python::{RequiresPython, RequiresPythonError, RequiresPythonRange};
 pub use resolution::{AnnotationStyle, DisplayResolutionGraph, ResolutionGraph};
 pub use resolution_mode::ResolutionMode;
 pub use resolver::{

diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/...r/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap b/...r/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/...ck/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap b/...ck/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/.../src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_unambiguous.snap b/.../src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_unambiguous.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/...es/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_has_subdir.snap b/...es/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_has_subdir.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_no_subdir.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_no_subdir.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_directory.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_directory.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_editable.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_editable.snap
@@ -17,12 +17,12 @@ Ok(
                 ],
             ),
             range: RequiresPythonRange(
-                RequiresPythonBound(
+                LowerBound(
                     Included(
                         "3.12",
                     ),
                 ),
-                RequiresPythonBound(
+                UpperBound(
                     Unbounded,
                 ),
             ),

diff --git a/crates/uv-resolver/src/marker.rs b/crates/uv-resolver/src/marker.rs
@@ -1,5 +1,4 @@
-use crate::requires_python::RequiresPythonRange;
-use crate::RequiresPythonBound;
+use crate::requires_python::{LowerBound, RequiresPythonRange, UpperBound};
 use pep440_rs::Version;
 use pep508_rs::{MarkerTree, MarkerTreeKind, MarkerValueVersion};
 use pubgrub::Range;
@@ -62,7 +61,7 @@ pub(crate) fn requires_python(tree: &MarkerTree) -> Option<RequiresPythonRange>
     let (lower, upper) = range.bounding_range()?;
 
     Some(RequiresPythonRange::new(
-        RequiresPythonBound::new(lower.cloned()),
-        RequiresPythonBound::new(upper.cloned()),
+        LowerBound::new(lower.cloned()),
+        UpperBound::new(upper.cloned()),
     ))
 }