This commit is contained in:
konsti 2025-12-16 10:53:44 +01:00 committed by GitHub
commit be3b72ba50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 80 additions and 16 deletions

View File

@ -794,7 +794,7 @@ impl Display for StatusCodeError {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(
f,
"Querying Python at `{}` failed with exit status {}",
"Querying Python at `{}` failed with {}",
self.path.display(),
self.code
)?;
@ -918,6 +918,27 @@ pub enum InterpreterInfoError {
},
#[error("Only Pyodide is support for Emscripten Python")]
EmscriptenNotPyodide,
#[error("Python is missing PYTHONHOME. If you are using a managed Python interpreter, this is a bug in older patch versions. Reinstalling the latest patch version and recreating the virtual environment solves this: `{}` and `{}`.", "uv python install --reinstall".green(), "uv venv".green())]
PythonHomeNotFound,
}
impl InterpreterInfoError {
/// Check whether the stderr of `python` matches a known pattern.
pub(crate) fn from_query_stderr(stderr: &str) -> Option<Self> {
// If the Python version is too old, we may not even be able to invoke the query script
if stderr.contains("Unknown option: -I") {
return Some(Self::UnsupportedPython);
}
// Until we fixed the PBS bug, inform the user that this is bug on our side and can be fixed
// with `uv venv`.
// https://github.com/astral-sh/python-build-standalone/issues/380
if stderr.contains("ModuleNotFoundError: No module named 'encodings'") {
return Some(Self::PythonHomeNotFound);
}
None
}
}
#[allow(clippy::struct_excessive_bools)]
@ -994,10 +1015,9 @@ impl InterpreterInfo {
if !output.status.success() {
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
// If the Python version is too old, we may not even be able to invoke the query script
if stderr.contains("Unknown option: -I") {
if let Some(query_error) = InterpreterInfoError::from_query_stderr(&stderr) {
return Err(Error::QueryScript {
err: InterpreterInfoError::UnsupportedPython,
err: query_error,
path: interpreter.to_path_buf(),
});
}
@ -1014,20 +1034,19 @@ impl InterpreterInfo {
serde_json::from_slice(&output.stdout).map_err(|err| {
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
// If the Python version is too old, we may not even be able to invoke the query script
if stderr.contains("Unknown option: -I") {
Error::QueryScript {
err: InterpreterInfoError::UnsupportedPython,
if let Some(query_error) = InterpreterInfoError::from_query_stderr(&stderr) {
return Error::QueryScript {
err: query_error,
path: interpreter.to_path_buf(),
};
}
} else {
Error::UnexpectedResponse(UnexpectedResponseError {
err,
stdout: String::from_utf8_lossy(&output.stdout).trim().to_string(),
stderr,
path: interpreter.to_path_buf(),
})
}
})?;
match result {

View File

@ -3950,3 +3950,48 @@ fn python_install_upgrade_version_file() {
hint: The version request came from a `.python-version` file; change the patch version in the file to upgrade instead
");
}
/// Show a fitting error message for
/// <https://github.com/astral-sh/python-build-standalone/issues/380>.
#[cfg(unix)]
#[test]
fn missing_python_home_error_message() -> anyhow::Result<()> {
let context = TestContext::new("3.12");
// Create a Python project so we can use `uv sync`
context.init().assert().success();
// Create a broken venv from a symlink.
let sys_executable = fs_err::canonicalize(context.venv.join("bin").join("python"))?;
fs_err::os::unix::fs::symlink(sys_executable, context.temp_dir.join("python-link"))?;
fs_err::remove_dir_all(context.venv.as_ref())?;
Command::new(context.temp_dir.join("python-link"))
.arg("-m")
.arg("venv")
.arg("--without-pip")
.arg(context.venv.as_ref())
.assert()
.success();
uv_snapshot!(context.filters(), context.pip_list().arg("-p").arg(context.venv.join("bin").join("python")), @r"
success: false
exit_code: 2
----- stdout -----
----- stderr -----
error: Failed to inspect Python interpreter from provided path at `.venv/bin/python`
Caused by: Can't use Python at `[VENV]/bin/python`
Caused by: Python is missing PYTHONHOME. If you are using a managed Python interpreter, this is a known bug (https://github.com/astral-sh/python-build-standalone/issues/380). You can recreate the virtual environment with `uv venv`.
");
// By default, we skip broken interpreters
uv_snapshot!(context.filters(), context.pip_list(), @r"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
");
Ok(())
}