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

Allow greater than star (torch (>=1.9.*)) in lenient requirement (#351)

Browse source 
This appeared in the pypi top 8k testing.
This commit is contained in:
konsti 2023-11-07 12:37:23 +01:00 • committed by GitHub
parent fbe28d3b7c
commit c883b123ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/pypi-types/src/metadata.rs
View file

@ -211,8 +211,9 @@ impl Metadata21 {
}
static MISSING_COMMA: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\d)([<>=~^!])").unwrap());
static NOT_EQUAL_TILDE: Lazy<Regex> = Lazy::new(|| Regex::new(r"!=~((?:\d\.)*\d)").unwrap());
/// e.g. `>=1.9.*`
static GREATER_THAN_STAR: Lazy<Regex> = Lazy::new(|| Regex::new(r">=(\d+\.\d+)\.\*").unwrap());
/// Like [`Requirement`], but attempts to correct some common errors in user-provided requirements.
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
@ -247,6 +248,17 @@ impl FromStr for LenientRequirement {
}
}
// Given `torch (>=1.9.*)`, rewrite to `torch (>=1.9)`
let patched = GREATER_THAN_STAR.replace(s, r">=${1}");
if patched != s {
if let Ok(requirement) = Requirement::from_str(&patched) {
warn!(
"Removing star after greater equal operator (before: `{s}`; after: `{patched}`)",
);
return Ok(Self(requirement));
}
}
Err(err)
}
}
@ -339,4 +351,13 @@ mod tests {
let expected: Requirement = Requirement::from_str("jupyter-core (!=5.*,>=4.12)").unwrap();
assert_eq!(actual, expected);
}
#[test]
fn greater_than_star() {
let actual: Requirement = LenientRequirement::from_str("torch (>=1.9.*)")
.unwrap()
.into();
let expected: Requirement = Requirement::from_str("torch (>=1.9)").unwrap();
assert_eq!(actual, expected);
}
}