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

Add missing-dot fix to lenient requirements (#416)

Browse source 
Part of https://github.com/astral-sh/puffin/issues/408.
This commit is contained in:
Charlie Marsh 2023-11-13 12:17:01 -08:00 • committed by GitHub
parent 0af2f7e39f
commit 582c94cec3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -211,10 +211,14 @@ impl Metadata21 {
} }
} }
/// Ex) `>=7.2.0<8.0.0`
static MISSING_COMMA: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\d)([<>=~^!])").unwrap()); static MISSING_COMMA: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\d)([<>=~^!])").unwrap());
/// Ex) `!=~5.0`
static NOT_EQUAL_TILDE: Lazy<Regex> = Lazy::new(|| Regex::new(r"!=~((?:\d\.)*\d)").unwrap()); static NOT_EQUAL_TILDE: Lazy<Regex> = Lazy::new(|| Regex::new(r"!=~((?:\d\.)*\d)").unwrap());
/// e.g. `>=1.9.*` /// Ex) `>=1.9.*`
static GREATER_THAN_STAR: Lazy<Regex> = Lazy::new(|| Regex::new(r">=(\d+\.\d+)\.\*").unwrap()); static GREATER_THAN_STAR: Lazy<Regex> = Lazy::new(|| Regex::new(r">=(\d+\.\d+)\.\*").unwrap());
/// Ex) `!=3.0*`
static MISSING_DOT: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\d\.\d)+\*").unwrap());
/// Like [`Requirement`], but attempts to correct some common errors in user-provided requirements. /// Like [`Requirement`], but attempts to correct some common errors in user-provided requirements.
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)] #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
@ -228,7 +232,7 @@ impl FromStr for LenientRequirement {
Ok(requirement) => Ok(Self(requirement)), Ok(requirement) => Ok(Self(requirement)),
Err(err) => { Err(err) => {
// Given `elasticsearch-dsl (>=7.2.0<8.0.0)`, rewrite to `elasticsearch-dsl (>=7.2.0,<8.0.0)`. // Given `elasticsearch-dsl (>=7.2.0<8.0.0)`, rewrite to `elasticsearch-dsl (>=7.2.0,<8.0.0)`.
let patched = MISSING_COMMA.replace(s, r"$1,$2"); let patched = MISSING_COMMA.replace_all(s, r"$1,$2");
if patched != s { if patched != s {
if let Ok(requirement) = Requirement::from_str(&patched) { if let Ok(requirement) = Requirement::from_str(&patched) {
warn!( warn!(
@ -239,7 +243,7 @@ impl FromStr for LenientRequirement {
} }
// Given `jupyter-core (!=~5.0,>=4.12)`, rewrite to `jupyter-core (!=5.0.*,>=4.12)`. // Given `jupyter-core (!=~5.0,>=4.12)`, rewrite to `jupyter-core (!=5.0.*,>=4.12)`.
let patched = NOT_EQUAL_TILDE.replace(s, r"!=${1}.*"); let patched = NOT_EQUAL_TILDE.replace_all(s, r"!=${1}.*");
if patched != s { if patched != s {
if let Ok(requirement) = Requirement::from_str(&patched) { if let Ok(requirement) = Requirement::from_str(&patched) {
warn!( warn!(
@ -250,7 +254,7 @@ impl FromStr for LenientRequirement {
} }
// Given `torch (>=1.9.*)`, rewrite to `torch (>=1.9)` // Given `torch (>=1.9.*)`, rewrite to `torch (>=1.9)`
let patched = GREATER_THAN_STAR.replace(s, r">=${1}"); let patched = GREATER_THAN_STAR.replace_all(s, r">=${1}");
if patched != s { if patched != s {
if let Ok(requirement) = Requirement::from_str(&patched) { if let Ok(requirement) = Requirement::from_str(&patched) {
warn!( warn!(
@ -260,6 +264,17 @@ impl FromStr for LenientRequirement {
} }
} }
// Given `pyzmq (!=3.0*)`, rewrite to `pyzmq (!=3.0.*)`
let patched = MISSING_DOT.replace_all(s, r"${1}.*");
if patched != s {
if let Ok(requirement) = Requirement::from_str(&patched) {
warn!(
"Inserting missing dot into invalid requirement (before: `{s}`; after: `{patched}`)",
);
return Ok(Self(requirement));
}
}
Err(err) Err(err)
} }
} }
@ -313,4 +328,15 @@ mod tests {
let expected: Requirement = Requirement::from_str("torch (>=1.9)").unwrap(); let expected: Requirement = Requirement::from_str("torch (>=1.9)").unwrap();
assert_eq!(actual, expected); assert_eq!(actual, expected);
} }
#[test]
fn missing_dot() {
let actual: Requirement =
LenientRequirement::from_str("pyzmq (>=2.7,!=3.0*,!=3.1*,!=3.2*)")
.unwrap()
.into();
let expected: Requirement =
Requirement::from_str("pyzmq (>=2.7,!=3.0.*,!=3.1.*,!=3.2.*)").unwrap();
assert_eq!(actual, expected);
}
} }