Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support pre-releases in Python version requests - command --python <major.minor.pre-release> #7335

Merged
merged 5 commits into from
Sep 17, 2024
Merged

Support pre-releases in Python version requests - command --python <major.minor.pre-release> #7335

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec55da6
Support pre-releases in Python version requests
mikeleppane Sep 12, 2024
1a77ffb
Enhance the error message of pre-release version in check_supported f…
mikeleppane Sep 13, 2024
f2f9b64
Refactor version parsing logic based on code review comments
mikeleppane Sep 17, 2024
beed76c
Remove unnecessary FromStr impl for Prerelease
mikeleppane Sep 17, 2024
15f6ba2
Review
zanieb Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions crates/pep440-rs/src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,6 +1415,20 @@ impl std::fmt::Display for Prerelease {
}
}

impl FromStr for Prerelease {
type Err = String;

fn from_str(s: &str) -> Result<Self, Self::Err> {
let version = Version::from_str(s).map_err(|err| err.to_string())?;
match version.pre() {
Some(pre) => Ok(pre),
None => Err(format!(
"unable to parse pre-release version from the given input: {s}"
)),
}
}
}

/// A part of the [local version identifier](<https://peps.python.org/pep-0440/#local-version-identifiers>)
///
/// Local versions are a mess:
Expand Down
140 changes: 130 additions & 10 deletions crates/uv-python/src/discovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use thiserror::Error;
use tracing::{debug, instrument, trace};
use which::{which, which_all};

use pep440_rs::{Version, VersionSpecifier, VersionSpecifiers};
use pep440_rs::{Prerelease, Version, VersionSpecifier, VersionSpecifiers};
use uv_cache::Cache;
use uv_fs::Simplified;
use uv_warnings::warn_user_once;
Expand Down Expand Up @@ -136,6 +136,7 @@ pub enum VersionRequest {
Major(u8),
MajorMinor(u8, u8),
MajorMinorPatch(u8, u8, u8),
MajorMinorPrerelease(u8, u8, Prerelease),
Range(VersionSpecifiers),
}

Expand Down Expand Up @@ -528,6 +529,7 @@ fn find_all_minor(
VersionRequest::MajorMinor(_, _) | VersionRequest::MajorMinorPatch(_, _, _) => {
Either::Right(iter::empty())
}
VersionRequest::MajorMinorPrerelease(_, _, _) => Either::Right(iter::empty()),
}
}

Expand Down Expand Up @@ -1461,6 +1463,15 @@ impl VersionRequest {
Some(Cow::Owned(format!("python{major}{extension}"))),
Some(python),
],

Self::MajorMinorPrerelease(major, minor, prerelease) => [
Some(Cow::Owned(format!(
"python{major}.{minor}{prerelease}{extension}",
))),
Some(Cow::Owned(format!("python{major}{extension}"))),
Some(python),
None,
],
}
}

Expand Down Expand Up @@ -1504,6 +1515,15 @@ impl VersionRequest {
Some(Cow::Owned(format!("{name}{major}{extension}"))),
Some(python),
],

Self::MajorMinorPrerelease(major, minor, prerelease) => [
Some(Cow::Owned(format!(
"{name}{major}.{minor}{prerelease}{extension}",
))),
Some(Cow::Owned(format!("{name}{major}{extension}"))),
Some(python),
None,
],
}
})
.chain(self.default_names())
Expand Down Expand Up @@ -1534,6 +1554,13 @@ impl VersionRequest {
));
}
}
Self::MajorMinorPrerelease(major, minor, _) => {
if (*major, *minor) < (3, 7) {
return Err(format!(
"Python <3.7 is not supported but {major}.{minor} was requested."
));
}
}
// TODO(zanieb): We could do some checking here to see if the range can be satisfied
Self::Range(_) => (),
}
Expand All @@ -1560,6 +1587,17 @@ impl VersionRequest {
let version = interpreter.python_version().only_release();
specifiers.contains(&version)
}
Self::MajorMinorPrerelease(major, minor, prerelease) => {
let version = interpreter.python_version();
let Some(interpreter_prerelease) = version.pre() else {
return false;
};
(
interpreter.python_major(),
interpreter.python_minor(),
interpreter_prerelease,
) == (*major, *minor, *prerelease)
}
}
}

Expand All @@ -1575,6 +1613,10 @@ impl VersionRequest {
== (*major, *minor, Some(*patch))
}
Self::Range(specifiers) => specifiers.contains(&version.version),
Self::MajorMinorPrerelease(major, minor, prerelease) => {
(version.major(), version.minor(), version.pre())
== (*major, *minor, Some(*prerelease))
}
}
}

Expand All @@ -1591,6 +1633,9 @@ impl VersionRequest {
Self::Range(specifiers) => {
specifiers.contains(&Version::new([u64::from(major), u64::from(minor)]))
}
Self::MajorMinorPrerelease(self_major, self_minor, _) => {
(*self_major, *self_minor) == (major, minor)
}
}
}

Expand All @@ -1609,6 +1654,10 @@ impl VersionRequest {
u64::from(minor),
u64::from(patch),
])),

Self::MajorMinorPrerelease(self_major, self_minor, _) => {
(*self_major, *self_minor) == (major, minor)
}
}
}

Expand All @@ -1619,6 +1668,7 @@ impl VersionRequest {
Self::Major(..) => false,
Self::MajorMinor(..) => false,
Self::MajorMinorPatch(..) => true,
Self::MajorMinorPrerelease(..) => false,
Self::Range(_) => false,
}
}
Expand All @@ -1633,6 +1683,9 @@ impl VersionRequest {
Self::Major(major) => Self::Major(major),
Self::MajorMinor(major, minor) => Self::MajorMinor(major, minor),
Self::MajorMinorPatch(major, minor, _) => Self::MajorMinor(major, minor),
Self::MajorMinorPrerelease(major, minor, prerelease) => {
Self::MajorMinorPrerelease(major, minor, prerelease)
}
Self::Range(_) => self,
}
}
Expand All @@ -1644,6 +1697,7 @@ impl VersionRequest {
Self::Major(_) => true,
Self::MajorMinor(..) => true,
Self::MajorMinorPatch(..) => true,
Self::MajorMinorPrerelease(..) => true,
Self::Range(specifiers) => specifiers.iter().any(VersionSpecifier::any_prerelease),
}
}
Expand All @@ -1663,12 +1717,31 @@ impl FromStr for VersionRequest {
Some(VersionRequest::MajorMinor(major, minor))
}

fn extract_prerelease(s: &str) -> (&str, Option<Prerelease>) {
match Prerelease::from_str(s) {
Ok(prerelease) => match s.rsplit_once(&prerelease.kind.to_string()) {
Some((s, _)) => (s, Some(prerelease)),
_ => (s, None),
},
Err(_) => (s, None),
}
}

let (version_without_pre, prerelease) = extract_prerelease(s);

// e.g. `3`, `38`, `312`
if let Some(request) = parse_nosep(s) {
if let Some(request) = parse_nosep(version_without_pre) {
if let Some(prerelease) = prerelease {
if let VersionRequest::MajorMinor(major, minor) = request {
return Ok(VersionRequest::MajorMinorPrerelease(
major, minor, prerelease,
));
}
}
Ok(request)
}
// e.g. `3.12.1`
else if let Ok(versions) = s
else if let Ok(versions) = version_without_pre
.splitn(3, '.')
.map(str::parse::<u8>)
.collect::<Result<Vec<_>, _>>()
Expand All @@ -1677,22 +1750,40 @@ impl FromStr for VersionRequest {
// e.g. `3`
[major] => VersionRequest::Major(*major),
// e.g. `3.10`
[major, minor] => VersionRequest::MajorMinor(*major, *minor),
[major, minor] => {
if let Some(prerelease) = prerelease {
return Ok(VersionRequest::MajorMinorPrerelease(
*major, *minor, prerelease,
));
}
VersionRequest::MajorMinor(*major, *minor)
}
// e.g. `3.10.4`
[major, minor, patch] => VersionRequest::MajorMinorPatch(*major, *minor, *patch),
[major, minor, patch] => {
if let Some(prerelease) = prerelease {
return Ok(VersionRequest::MajorMinorPrerelease(
*major, *minor, prerelease,
));
}
VersionRequest::MajorMinorPatch(*major, *minor, *patch)
}
_ => unreachable!(),
};

Ok(selector)

// e.g. `>=3.12.1,<3.12`
} else if let Ok(specifiers) = VersionSpecifiers::from_str(s) {
} else if let Ok(specifiers) = VersionSpecifiers::from_str(version_without_pre) {
if specifiers.is_empty() {
return Err(Error::InvalidVersionRequest(s.to_string()));
return Err(Error::InvalidVersionRequest(
version_without_pre.to_string(),
));
}
Ok(Self::Range(specifiers))
} else {
Err(Error::InvalidVersionRequest(s.to_string()))
Err(Error::InvalidVersionRequest(
version_without_pre.to_string(),
))
}
}
}
Expand All @@ -1713,6 +1804,9 @@ impl fmt::Display for VersionRequest {
Self::MajorMinorPatch(major, minor, patch) => {
write!(f, "{major}.{minor}.{patch}")
}
Self::MajorMinorPrerelease(major, minor, prerelease) => {
write!(f, "{major}.{minor}{prerelease}")
}
Self::Range(specifiers) => write!(f, "{specifiers}"),
}
}
Expand Down Expand Up @@ -1834,6 +1928,7 @@ mod tests {
use std::{path::PathBuf, str::FromStr};

use assert_fs::{prelude::*, TempDir};
use pep440_rs::Prerelease;
use test_log::test;

use crate::{
Expand All @@ -1859,8 +1954,21 @@ mod tests {
PythonRequest::Version(VersionRequest::from_str(">=3.12,<3.13").unwrap())
);
assert_eq!(
PythonRequest::parse("foo"),
PythonRequest::ExecutableName("foo".to_string())
PythonRequest::parse(">=3.12,<3.13"),
PythonRequest::Version(VersionRequest::from_str(">=3.12,<3.13").unwrap())
);

assert_eq!(
PythonRequest::parse("3.13.0a1"),
PythonRequest::Version(VersionRequest::from_str("3.13.0a1").unwrap())
);
assert_eq!(
PythonRequest::parse("3.13.0b5"),
PythonRequest::Version(VersionRequest::from_str("3.13.0b5").unwrap())
);
assert_eq!(
PythonRequest::parse("3.13.0rc1"),
PythonRequest::Version(VersionRequest::from_str("3.13.0rc1").unwrap())
);
assert_eq!(
PythonRequest::parse("cpython"),
Expand Down Expand Up @@ -2094,6 +2202,18 @@ mod tests {
VersionRequest::from_str("3100").unwrap(),
VersionRequest::MajorMinor(3, 100)
);
assert_eq!(
VersionRequest::from_str("3.13a1").unwrap(),
VersionRequest::MajorMinorPrerelease(3, 13, Prerelease::from_str("3.13a1").unwrap())
);
assert_eq!(
VersionRequest::from_str("3.13.0b2").unwrap(),
VersionRequest::MajorMinorPrerelease(3, 13, Prerelease::from_str("3.13.0b2").unwrap())
);
assert_eq!(
VersionRequest::from_str("3.13.0rc3").unwrap(),
VersionRequest::MajorMinorPrerelease(3, 13, Prerelease::from_str("3.13.0rc3").unwrap())
);
assert!(
// Test for overflow
matches!(
Expand Down
Loading