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

Add support for managed installs of free-threaded Python (#8100)

Browse source 
Closes https://github.com/astral-sh/uv/issues/7193

```

❯ cargo run -q -- python uninstall 3.13t
Searching for Python versions matching: Python 3.13t
Uninstalled Python 3.13.0 in 231ms
 - cpython-3.13.0+freethreaded-macos-aarch64-none
❯ cargo run -q -- python install 3.13t
Searching for Python versions matching: Python 3.13t
Installed Python 3.13.0 in 3.54s
 + cpython-3.13.0+freethreaded-macos-aarch64-none
❯ cargo run -q -- python install 3.12t
Searching for Python versions matching: Python 3.12t
error: No download found for request: cpython-3.12t-macos-aarch64-none
❯ cargo run -q -- python install 3.13rc3t
Searching for Python versions matching: Python 3.13rc3t
Found existing installation for Python 3.13rc3t: cpython-3.13.0+freethreaded-macos-aarch64-none
❯ cargo run -q -- run -p 3.13t python -c "import sys; print(sys.base_prefix)"
/Users/zb/.local/share/uv/python/cpython-3.13.0+freethreaded-macos-aarch64-none
```
This commit is contained in:
Zanie Blue 2024-10-14 15:18:52 -05:00 • committed by GitHub
parent db0f0aec09
commit 5f33915e03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 6319 additions and 4211 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/uv-python/src/installation.rs
View file

@ -16,7 +16,7 @@ use crate::managed::{ManagedPythonInstallation, ManagedPythonInstallations};
use crate::platform::{Arch, Libc, Os};
use crate::{
downloads, Error, ImplementationName, Interpreter, PythonDownloads, PythonPreference,
PythonSource, PythonVersion,
PythonSource, PythonVariant, PythonVersion,
};
/// A Python interpreter and accompanying tools.
@ -227,6 +227,7 @@ pub struct PythonInstallationKey {
pub(crate) os: Os,
pub(crate) arch: Arch,
pub(crate) libc: Libc,
pub(crate) variant: PythonVariant,
}
impl PythonInstallationKey {
@ -239,6 +240,7 @@ impl PythonInstallationKey {
os: Os,
arch: Arch,
libc: Libc,
variant: PythonVariant,
) -> Self {
Self {
implementation,
@ -249,6 +251,7 @@ impl PythonInstallationKey {
os,
arch,
libc,
variant,
}
}
@ -258,6 +261,7 @@ impl PythonInstallationKey {
os: Os,
arch: Arch,
libc: Libc,
variant: PythonVariant,
) -> Self {
Self {
implementation,
@ -268,6 +272,7 @@ impl PythonInstallationKey {
os,
arch,
libc,
variant,
}
}
@ -303,9 +308,13 @@ impl PythonInstallationKey {
impl fmt::Display for PythonInstallationKey {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let variant = match self.variant {
PythonVariant::Default => String::new(),
PythonVariant::Freethreaded => format!("+{}", self.variant),
};
write!(
f,
"{}-{}.{}.{}{}-{}-{}-{}",
"{}-{}.{}.{}{}{}-{}-{}-{}",
self.implementation,
self.major,
self.minor,
@ -313,6 +322,7 @@ impl fmt::Display for PythonInstallationKey {
self.prerelease
.map(|pre| pre.to_string())
.unwrap_or_default(),
variant,
self.os,
self.arch,
self.libc
@ -349,6 +359,19 @@ impl FromStr for PythonInstallationKey {
PythonInstallationKeyError::ParseError(key.to_string(), format!("invalid libc: {err}"))
})?;
let (version, variant) = match version.split_once('+') {
Some((version, variant)) => {
let variant = PythonVariant::from_str(variant).map_err(|()| {
PythonInstallationKeyError::ParseError(
key.to_string(),
format!("invalid Python variant: {variant}"),
)
})?;
(version, variant)
}
None => (*version, PythonVariant::Default),
};
let version = PythonVersion::from_str(version).map_err(|err| {
PythonInstallationKeyError::ParseError(
key.to_string(),
@ -362,6 +385,7 @@ impl FromStr for PythonInstallationKey {
os,
arch,
libc,
variant,
))
}
}