Improve error messages and make cache failures non fatal (#333)

This commit is contained in:
konsti 2023-11-06 15:06:27 +01:00 committed by GitHub
parent 3defe233e6
commit 6f83a44fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 24 deletions

View file

@ -169,11 +169,15 @@ impl SourceDistributionBuilder {
let resolved_requirements = build_context
.resolve(&build_system.requires)
.await
.map_err(|err| Error::RequirementsInstall("build-system.requires", err))?;
.map_err(|err| {
Error::RequirementsInstall("build-system.requires (resolve)", err)
})?;
build_context
.install(&resolved_requirements, &venv)
.await
.map_err(|err| Error::RequirementsInstall("build-system.requires", err))?;
.map_err(|err| {
Error::RequirementsInstall("build-system.requires (install)", err)
})?;
build_system.requires.clone()
} else {
// TODO(konstin): Resolve those once globally and cache per puffin invocation
@ -185,11 +189,11 @@ impl SourceDistributionBuilder {
let resolved_requirements = build_context
.resolve(&requirements)
.await
.map_err(|err| Error::RequirementsInstall("setup.py build", err))?;
.map_err(|err| Error::RequirementsInstall("setup.py build (resolve)", err))?;
build_context
.install(&resolved_requirements, &venv)
.await
.map_err(|err| Error::RequirementsInstall("setup.py build", err))?;
.map_err(|err| Error::RequirementsInstall("setup.py build (install)", err))?;
requirements
};
@ -458,12 +462,12 @@ async fn create_pep517_build_environment(
let resolved_requirements = build_context
.resolve(&requirements)
.await
.map_err(|err| Error::RequirementsInstall("build-system.requires", err))?;
.map_err(|err| Error::RequirementsInstall("build-system.requires (resolve)", err))?;
build_context
.install(&resolved_requirements, venv)
.await
.map_err(|err| Error::RequirementsInstall("build-system.requires", err))?;
.map_err(|err| Error::RequirementsInstall("build-system.requires (install)", err))?;
}
Ok(())
}