mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-30 23:37:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Do not use free-threaded interpreters without a free-threaded request (#8191)

Browse source 
As mentioned in https://github.com/astral-sh/uv/issues/8189

We only checked if an interpreter was free-threaded _when_ free-threaded
variants were requested. But we should not use free-threaded
interpreters unless explicitly requested.
This commit is contained in:
Zanie Blue 2024-10-14 17:48:32 -05:00 • committed by GitHub
parent 01c44af3c3
commit b466202305
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/uv-python/src/discovery.rs
View file

@ -1225,6 +1225,14 @@ fn is_windows_store_shim(_path: &Path) -> bool {
false
}
impl PythonVariant {
fn matches_interpreter(self, interpreter: &Interpreter) -> bool {
match self {
PythonVariant::Default => !interpreter.gil_disabled(),
PythonVariant::Freethreaded => interpreter.gil_disabled(),
}
}
}
impl PythonRequest {
/// Create a request from a string.
///
@ -1798,27 +1806,30 @@ impl VersionRequest {
/// Check if a interpreter matches the requested Python version.
pub(crate) fn matches_interpreter(&self, interpreter: &Interpreter) -> bool {
if self.is_freethreaded() && !interpreter.gil_disabled() {
return false;
}
match self {
Self::Any | Self::Default => true,
Self::Major(major, _) => interpreter.python_major() == *major,
Self::MajorMinor(major, minor, _) => {
(interpreter.python_major(), interpreter.python_minor()) == (*major, *minor)
Self::Any => true,
// Do not use free-threaded interpreters by default
Self::Default => PythonVariant::Default.matches_interpreter(interpreter),
Self::Major(major, variant) => {
interpreter.python_major() == *major && variant.matches_interpreter(interpreter)
}
Self::MajorMinorPatch(major, minor, patch, _) => {
Self::MajorMinor(major, minor, variant) => {
(interpreter.python_major(), interpreter.python_minor()) == (*major, *minor)
&& variant.matches_interpreter(interpreter)
}
Self::MajorMinorPatch(major, minor, patch, variant) => {
(
interpreter.python_major(),
interpreter.python_minor(),
interpreter.python_patch(),
) == (*major, *minor, *patch)
&& variant.matches_interpreter(interpreter)
}
Self::Range(specifiers, _) => {
Self::Range(specifiers, variant) => {
let version = interpreter.python_version().only_release();
specifiers.contains(&version)
specifiers.contains(&version) && variant.matches_interpreter(interpreter)
}
Self::MajorMinorPrerelease(major, minor, prerelease, _) => {
Self::MajorMinorPrerelease(major, minor, prerelease, variant) => {
let version = interpreter.python_version();
let Some(interpreter_prerelease) = version.pre() else {
return false;
@ -1828,6 +1839,7 @@ impl VersionRequest {
interpreter.python_minor(),
interpreter_prerelease,
) == (*major, *minor, *prerelease)
&& variant.matches_interpreter(interpreter)
}
}
}