Skip to content

Commit

Permalink
Remove extraneous are from wheel tag error messages (#5303)
Browse files Browse the repository at this point in the history
## Summary

Closes #5297.
  • Loading branch information
charliermarsh committed Jul 22, 2024
1 parent 2d9df48 commit ca46ce2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
14 changes: 6 additions & 8 deletions crates/distribution-types/src/prioritized_distribution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,18 @@ impl Display for IncompatibleDist {
match self {
Self::Wheel(incompatibility) => match incompatibility {
IncompatibleWheel::NoBinary => {
f.write_str("has no available source distribution and using wheels is disabled")
f.write_str("has no source distribution and using wheels is disabled")
}
IncompatibleWheel::Tag(tag) => match tag {
IncompatibleTag::Invalid => {
f.write_str("has no wheels are available with valid tags")
IncompatibleTag::Invalid => f.write_str("has no wheels with valid tags"),
IncompatibleTag::Python => {
f.write_str("has no wheels with a matching Python implementation tag")
}
IncompatibleTag::Python => f.write_str(
"has no wheels are available with a matching Python implementation",
),
IncompatibleTag::Abi => {
f.write_str("has no wheels are available with a matching Python ABI")
f.write_str("has no wheels with a matching Python ABI tag")
}
IncompatibleTag::Platform => {
f.write_str("has no wheels are available with a matching platform")
f.write_str("has no wheels with a matching platform tag")
}
},
IncompatibleWheel::Yanked(yanked) => match yanked {
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4287,7 +4287,7 @@ fn lock_requires_python_no_wheels() -> Result<()> {
----- stderr -----
warning: `uv lock` is experimental and may change without warning
× No solution found when resolving dependencies:
╰─▶ Because dearpygui==1.9.1 has no wheels are available with a matching Python ABI and project==0.1.0 depends on dearpygui==1.9.1, we can conclude that project==0.1.0 cannot be used.
╰─▶ Because dearpygui==1.9.1 has no wheels with a matching Python ABI tag and project==0.1.0 depends on dearpygui==1.9.1, we can conclude that project==0.1.0 cannot be used.
And because only project==0.1.0 is available and you require project, we can conclude that the requirements are unsatisfiable.
"###);

Expand Down
12 changes: 6 additions & 6 deletions crates/uv/tests/pip_install_scenarios.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,7 @@ fn local_used_without_sdist() {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because package-a==1.2.3 has no wheels are available with a matching Python ABI and you require package-a==1.2.3, we can conclude that the requirements are unsatisfiable.
╰─▶ Because package-a==1.2.3 has no wheels with a matching Python ABI tag and you require package-a==1.2.3, we can conclude that the requirements are unsatisfiable.
"###);

// The version '1.2.3+foo' satisfies the constraint '==1.2.3'.
Expand Down Expand Up @@ -1783,7 +1783,7 @@ fn local_transitive_confounding() {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because package-b==2.0.0 has no wheels are available with a matching Python ABI and package-a==1.0.0 depends on package-b==2.0.0, we can conclude that package-a==1.0.0 cannot be used.
╰─▶ Because package-b==2.0.0 has no wheels with a matching Python ABI tag and package-a==1.0.0 depends on package-b==2.0.0, we can conclude that package-a==1.0.0 cannot be used.
And because only package-a==1.0.0 is available and you require package-a, we can conclude that the requirements are unsatisfiable.
"###);

Expand Down Expand Up @@ -4194,7 +4194,7 @@ fn no_sdist_no_wheels_with_matching_platform() {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no wheels are available with a matching platform, we can conclude that all versions of package-a cannot be used.
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no wheels with a matching platform tag, we can conclude that all versions of package-a cannot be used.
And because you require package-a, we can conclude that the requirements are unsatisfiable.
"###);

Expand Down Expand Up @@ -4235,7 +4235,7 @@ fn no_sdist_no_wheels_with_matching_python() {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no wheels are available with a matching Python implementation, we can conclude that all versions of package-a cannot be used.
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no wheels with a matching Python implementation tag, we can conclude that all versions of package-a cannot be used.
And because you require package-a, we can conclude that the requirements are unsatisfiable.
"###);

Expand Down Expand Up @@ -4276,7 +4276,7 @@ fn no_sdist_no_wheels_with_matching_abi() {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no wheels are available with a matching Python ABI, we can conclude that all versions of package-a cannot be used.
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no wheels with a matching Python ABI tag, we can conclude that all versions of package-a cannot be used.
And because you require package-a, we can conclude that the requirements are unsatisfiable.
"###);

Expand Down Expand Up @@ -4358,7 +4358,7 @@ fn only_wheels_no_binary() {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no available source distribution and using wheels is disabled, we can conclude that all versions of package-a cannot be used.
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 has no source distribution and using wheels is disabled, we can conclude that all versions of package-a cannot be used.
And because you require package-a, we can conclude that the requirements are unsatisfiable.
"###);

Expand Down

0 comments on commit ca46ce2

Please sign in to comment.