mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 21:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use VersionSpecifier::from_release_only_bounds

Browse source
This commit is contained in:
konstin 2025-06-30 11:04:34 +02:00
parent 8aadc928c2
commit d4664db072
2 changed files with 38 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/uv-pep440/src/version_specifier.rs
View file

@ -475,6 +475,25 @@ impl VersionSpecifier {
None,
)
}
// `v >= 3.7 && v < 3.8` is equivalent to `v == 3.7.*`
(Bound::Included(v1), Bound::Excluded(v2)) => {
match *v1.only_release_trimmed().release() {
[major] if *v2.release() == [major, 1] => (
Some(VersionSpecifier::equals_star_version(Version::new([
major, 0,
]))),
None,
),
[major, minor] if *v2.release() == [major, minor + 1] => (
Some(VersionSpecifier::equals_star_version(v1.clone())),
None,
),
_ => (
VersionSpecifier::from_lower_bound(&Bound::Included(v1.clone())),
VersionSpecifier::from_upper_bound(&Bound::Excluded(v2.clone())),
),
}
}
(lower, upper) => (
VersionSpecifier::from_lower_bound(lower),
VersionSpecifier::from_upper_bound(upper),

62
crates/uv-pep508/src/marker/simplify.rs
View file

@ -345,56 +345,32 @@ where
/// Returns `Some` if the version range can be simplified as a star specifier.
///
/// For positive ranges like `python_full_version >= '3' and python_full_version < '3.1'`,
/// returns `== '3.0.*'`.
/// Only for the two bounds case not covered by [`VersionSpecifier::from_release_only_bounds`].
///
/// For negative ranges like `python_full_version < '3.8' or python_full_version >= '3.9'`,
/// returns `!= '3.8.*'`.
fn star_range_specifier(range: &Ranges<Version>) -> Option<VersionSpecifier> {
match range.iter().count() {
// Check for positive star range: single segment (Included(v1), Excluded(v2))
1 => {
let bounds = range.iter().next()?;
if let (Bound::Included(v1), Bound::Excluded(v2)) = bounds {
match *v1.only_release_trimmed().release() {
[major] if *v2.release() == [major, 1] => {
Some(VersionSpecifier::equals_star_version(Version::new([
major, 0,
])))
}
[major, minor] if *v2.release() == [major, minor + 1] => {
Some(VersionSpecifier::equals_star_version(v1.clone()))
}
_ => None,
}
} else {
None
if range.iter().count() != 2 {
return None;
}
// Check for negative star range: two segments [(Unbounded, Excluded(v1)), (Included(v2), Unbounded)]
let (b1, b2) = range.iter().collect_tuple()?;
if let ((Bound::Unbounded, Bound::Excluded(v1)), (Bound::Included(v2), Bound::Unbounded)) =
(b1, b2)
{
match *v1.only_release_trimmed().release() {
[major] if *v2.release() == [major, 1] => {
Some(VersionSpecifier::not_equals_star_version(Version::new([
major, 0,
])))
}
}
// Check for negative star range: two segments [(Unbounded, Excluded(v1)), (Included(v2), Unbounded)]
2 => {
let (b1, b2) = range.iter().collect_tuple()?;
if let (
(Bound::Unbounded, Bound::Excluded(v1)),
(Bound::Included(v2), Bound::Unbounded),
) = (b1, b2)
{
match *v1.only_release_trimmed().release() {
[major] if *v2.release() == [major, 1] => {
Some(VersionSpecifier::not_equals_star_version(Version::new([
major, 0,
])))
}
[major, minor] if *v2.release() == [major, minor + 1] => {
Some(VersionSpecifier::not_equals_star_version(v1.clone()))
}
_ => None,
}
} else {
None
[major, minor] if *v2.release() == [major, minor + 1] => {
Some(VersionSpecifier::not_equals_star_version(v1.clone()))
}
_ => None,
}
_ => None,
} else {
None
}
}