Switch from semver::Version to pep440_rs::Version for Python vers…

…ion comparisons during release Otherwise, we fail to parse `3.13.0rc2` because the Python prerelease syntax does not match the Cargo SemVer syntax
indygreg · Sep 9, 2024 · 0d5cb96 · 0d5cb96
1 parent 3d279ba
commit 0d5cb96
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,6 +23,7 @@ object = "0.32.2"
 octocrab = { version = "0.34.1", features = ["rustls", "stream"] }
 once_cell = "1.19.0"
 pdb = "0.8.0"
+pep440_rs = "0.6.6"
 rayon = "1.8.1"
 reqwest = { version = "0.11.24", features = ["rustls", "stream"] }
 scroll = "0.12.0"

diff --git a/src/github.rs b/src/github.rs
@@ -2,6 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+use std::str::FromStr;
+
 use crate::release::{bootstrap_llvm, produce_install_only_stripped};
 use {
     crate::release::{produce_install_only, RELEASE_TRIPLES},
@@ -355,8 +357,8 @@ pub async fn command_upload_release_distributions(args: &ArgMatches) -> Result<(
     for version in python_versions {
         for (triple, release) in RELEASE_TRIPLES.iter() {
             if let Some(req) = &release.python_version_requirement {
-                let python_version = semver::Version::parse(version)?;
-                if !req.matches(&python_version) {
+                let python_version = pep440_rs::Version::from_str(version)?;
+                if !req.contains(&python_version) {
                     continue;
                 }
             }

diff --git a/src/release.rs b/src/release.rs
@@ -6,13 +6,16 @@ use anyhow::Context;
 use futures::StreamExt;
 
 use object::FileKind;
-use std::process::{Command, Stdio};
+use std::{
+    process::{Command, Stdio},
+    str::FromStr,
+};
 use url::Url;
 use {
     crate::json::parse_python_json,
     anyhow::{anyhow, Result},
     once_cell::sync::Lazy,
-    semver::VersionReq,
+    pep440_rs::VersionSpecifier,
     std::{
         collections::BTreeMap,
         io::{BufRead, Read, Write},
@@ -27,7 +30,7 @@ pub struct TripleRelease {
     /// Build suffix to use for the `install_only` artifact.
     pub install_only_suffix: &'static str,
     /// Minimum Python version this triple is released for.
-    pub python_version_requirement: Option<VersionReq>,
+    pub python_version_requirement: Option<VersionSpecifier>,
 }
 
 pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::new(|| {
@@ -107,7 +110,7 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
 
@@ -116,7 +119,7 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
 
@@ -125,7 +128,7 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
 
@@ -134,7 +137,7 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
 
@@ -151,23 +154,23 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
         TripleRelease {
             suffixes: linux_suffixes_pgo.clone(),
             install_only_suffix: "pgo+lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
     h.insert(
         "x86_64_v3-unknown-linux-gnu",
         TripleRelease {
             suffixes: linux_suffixes_pgo.clone(),
             install_only_suffix: "pgo+lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
     h.insert(
         "x86_64_v4-unknown-linux-gnu",
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
     h.insert(
@@ -183,23 +186,23 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
     h.insert(
         "x86_64_v3-unknown-linux-musl",
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );
     h.insert(
         "x86_64_v4-unknown-linux-musl",
         TripleRelease {
             suffixes: linux_suffixes_nopgo.clone(),
             install_only_suffix: "lto",
-            python_version_requirement: Some(VersionReq::parse(">=3.9").unwrap()),
+            python_version_requirement: Some(VersionSpecifier::from_str(">=3.9").unwrap()),
         },
     );