mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-13 09:12:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve order implementation for Python bound (#5599)

Browse source 
## Summary

We shouldn't unequivocally treat exclusions as greater than
inclusions...
This commit is contained in:
Charlie Marsh 2024-07-30 10:05:54 -04:00 • committed by GitHub
parent 4e748363f8
commit 3e2ae93d6c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/uv-resolver/src/requires_python.rs
View file

@ -388,9 +388,10 @@ impl Ord for RequiresPythonBound {
fn cmp(&self, other: &Self) -> Ordering { fn cmp(&self, other: &Self) -> Ordering {
match (self.as_ref(), other.as_ref()) { match (self.as_ref(), other.as_ref()) {
(Bound::Included(a), Bound::Included(b)) => a.cmp(b), (Bound::Included(a), Bound::Included(b)) => a.cmp(b),
(Bound::Included(_), Bound::Excluded(_)) => Ordering::Less, (Bound::Included(a), Bound::Excluded(b)) => a.cmp(b).then(Ordering::Less),
(Bound::Excluded(_), Bound::Included(_)) => Ordering::Greater, (Bound::Excluded(a), Bound::Included(b)) => a.cmp(b).then(Ordering::Greater),
(Bound::Excluded(a), Bound::Excluded(b)) => a.cmp(b), (Bound::Excluded(a), Bound::Excluded(b)) => a.cmp(b),
(Bound::Unbounded, Bound::Unbounded) => Ordering::Equal,
(Bound::Unbounded, _) => Ordering::Less, (Bound::Unbounded, _) => Ordering::Less,
(_, Bound::Unbounded) => Ordering::Greater, (_, Bound::Unbounded) => Ordering::Greater,
} }
@ -399,12 +400,14 @@ impl Ord for RequiresPythonBound {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::cmp::Ordering;
use std::collections::Bound;
use std::str::FromStr; use std::str::FromStr;
use distribution_filename::WheelFilename; use distribution_filename::WheelFilename;
use pep440_rs::VersionSpecifiers; use pep440_rs::{Version, VersionSpecifiers};
use crate::RequiresPython; use crate::{RequiresPython, RequiresPythonBound};
#[test] #[test]
fn requires_python_included() { fn requires_python_included() {
@ -473,4 +476,25 @@ mod tests {
); );
} }
} }
#[test]
fn ordering() {
let versions = &[
// No bound
RequiresPythonBound::new(Bound::Unbounded),
// >=3.8
RequiresPythonBound::new(Bound::Included(Version::new([3, 8]))),
// >3.8
RequiresPythonBound::new(Bound::Excluded(Version::new([3, 8]))),
// >=3.8.1
RequiresPythonBound::new(Bound::Included(Version::new([3, 8, 1]))),
// >3.8.1
RequiresPythonBound::new(Bound::Excluded(Version::new([3, 8, 1]))),
];
for (i, v1) in versions.iter().enumerate() {
for v2 in &versions[i + 1..] {
assert_eq!(v1.cmp(v2), Ordering::Less, "less: {v1:?}\ngreater: {v2:?}",);
}
}
}
} }