Robin Krahl
f9a9f53476
This PR improves the error message for the problem described in https://github.com/astral-sh/uv/issues/1376. The original output duplicates the actual error message and includes lots of noise (`DirEntry { inner: DirEntry(...) }`). ``` $ uv pip install hexdump==3.3 error: Failed to download and build: hexdump==3.3 Caused by: Failed to extract source distribution: The top level of the archive must only contain a list directory, but it contains: [DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/__main__.py") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/hexdump.py") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/data") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/PKG-INFO") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/setup.py") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/README.txt") }] Caused by: The top level of the archive must only contain a list directory, but it contains: [DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/__main__.py") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/hexdump.py") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/data") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/PKG-INFO") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/setup.py") }, DirEntry { inner: DirEntry("/home/robin/.cache/uv/.tmpgSvTCk/README.txt") }] ``` This PR removes the duplication and `DirEntry` internals so that the error message is easier to grasp: ``` $ uv pip install hexdump==3.3 error: Failed to download and build: hexdump==3.3 Caused by: Failed to extract source distribution Caused by: The top level of the archive must only contain a list directory, but it contains: ["__main__.py", "hexdump.py", "data", "PKG-INFO", "setup.py", "README.txt"] ```
63 lines
2.3 KiB
Rust
63 lines
2.3 KiB
Rust
use tokio::task::JoinError;
|
|
use zip::result::ZipError;
|
|
|
|
use distribution_filename::WheelFilenameError;
|
|
use uv_normalize::PackageName;
|
|
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum Error {
|
|
#[error("Building source distributions is disabled")]
|
|
NoBuild,
|
|
#[error("Using pre-built wheels is disabled")]
|
|
NoBinary,
|
|
|
|
// Network error
|
|
#[error("Failed to parse URL: `{0}`")]
|
|
Url(String, #[source] url::ParseError),
|
|
#[error(transparent)]
|
|
JoinRelativeUrl(#[from] pypi_types::JoinRelativeError),
|
|
#[error("Git operation failed")]
|
|
Git(#[source] anyhow::Error),
|
|
#[error(transparent)]
|
|
Request(#[from] reqwest::Error),
|
|
#[error(transparent)]
|
|
Client(#[from] uv_client::Error),
|
|
|
|
// Cache writing error
|
|
#[error("Failed to read from the distribution cache")]
|
|
CacheRead(#[source] std::io::Error),
|
|
#[error("Failed to write to the distribution cache")]
|
|
CacheWrite(#[source] std::io::Error),
|
|
#[error("Failed to deserialize cache entry")]
|
|
CacheDecode(#[from] rmp_serde::decode::Error),
|
|
#[error("Failed to serialize cache entry")]
|
|
CacheEncode(#[from] rmp_serde::encode::Error),
|
|
|
|
// Build error
|
|
#[error("Failed to build: {0}")]
|
|
Build(String, #[source] anyhow::Error),
|
|
#[error("Failed to build editable: {0}")]
|
|
BuildEditable(String, #[source] anyhow::Error),
|
|
#[error("Built wheel has an invalid filename")]
|
|
WheelFilename(#[from] WheelFilenameError),
|
|
#[error("Package metadata name `{metadata}` does not match given name `{given}`")]
|
|
NameMismatch {
|
|
given: PackageName,
|
|
metadata: PackageName,
|
|
},
|
|
#[error("Failed to parse metadata from built wheel")]
|
|
Metadata(#[from] pypi_types::Error),
|
|
#[error("Failed to read `dist-info` metadata from built wheel")]
|
|
DistInfo(#[from] install_wheel_rs::Error),
|
|
#[error("Failed to read zip archive from built wheel")]
|
|
Zip(#[from] ZipError),
|
|
#[error("Source distribution directory contains neither readable pyproject.toml nor setup.py")]
|
|
DirWithoutEntrypoint,
|
|
#[error("Failed to extract source distribution")]
|
|
Extract(#[from] uv_extract::Error),
|
|
|
|
/// Should not occur; only seen when another task panicked.
|
|
#[error("The task executor is broken, did some other task panic?")]
|
|
Join(#[from] JoinError),
|
|
}
|