Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove additional 'because' #2849

Merged
merged 1 commit into from
Apr 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions crates/uv-resolver/src/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -429,18 +429,10 @@ impl<
.await?
{
Dependencies::Unavailable(reason) => {
let message = {
if matches!(package, PubGrubPackage::Root(_)) {
// Including front-matter for the root package is redundant
reason.clone()
} else {
format!("its dependencies are unusable because {reason}")
}
};
state.add_incompatibility(Incompatibility::unavailable(
package.clone(),
version.clone(),
message,
reason.clone(),
));
continue;
}
Expand Down
14 changes: 6 additions & 8 deletions crates/uv/tests/pip_compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4569,10 +4569,9 @@ fn invalid_metadata_requires_python() -> Result<()> {

----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because validation==2.0.0 is unusable because its dependencies are
unusable because the package metadata could not be parsed and you
require validation==2.0.0, we can conclude that the requirements are
unsatisfiable.
╰─▶ Because validation==2.0.0 is unusable because the package metadata could
not be parsed and you require validation==2.0.0, we can conclude that
the requirements are unsatisfiable.
"###
);

Expand All @@ -4598,10 +4597,9 @@ fn invalid_metadata_multiple_dist_info() -> Result<()> {

----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because validation==3.0.0 is unusable because its dependencies
are unusable because the package has an invalid format and you
require validation==3.0.0, we can conclude that the requirements are
unsatisfiable.
╰─▶ Because validation==3.0.0 is unusable because the package has an invalid
format and you require validation==3.0.0, we can conclude that the
requirements are unsatisfiable.
"###
);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Artifacts from the build process.
*.egg-info/
build/
Loading