mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Say "cannot be used" and "must be used" instead of "forbidden" and "mandatory" (#867)

Browse source 
Closes #858
This commit is contained in:
Zanie Blue 2024-01-10 14:49:40 -06:00 • committed by GitHub
parent 845ba6801d
commit a65c55ff4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/puffin-cli/tests/pip_compile.rs
View file

@ -672,7 +672,7 @@ fn compile_python_37() -> Result<()> {
× No solution found when resolving dependencies:
╰─▶ Because there are no versions of Python that satisfy Python>=3.8
and black==23.10.1 depends on Python>=3.8, we can conclude that
black==23.10.1 is forbidden.
black==23.10.1 cannot be used.
And because root depends on black==23.10.1 we can conclude that the
requirements are unsatisfiable.
"###);
@ -1562,7 +1562,7 @@ fn conflicting_transitive_url_dependency() -> Result<()> {
× No solution found when resolving dependencies:
╰─▶ Because flask==3.0.0 depends on werkzeug>=3.0.0 and there are no
versions of werkzeug that satisfy werkzeug>=3.0.0, we can conclude that
flask==3.0.0 is forbidden.
flask==3.0.0 cannot be used.
And because root depends on flask==3.0.0 we can conclude that the
requirements are unsatisfiable.
"###);

22
crates/puffin-cli/tests/pip_install_scenarios.rs
View file

@ -1176,7 +1176,7 @@ fn requires_transitive_package_only_prereleases_in_range() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because there are no versions of b that satisfy b>0.1 and a==0.1.0 depends on b>0.1, we can conclude that a==0.1.0 is forbidden.
╰─▶ Because there are no versions of b that satisfy b>0.1 and a==0.1.0 depends on b>0.1, we can conclude that a==0.1.0 cannot be used.
And because there are no versions of a that satisfy any of:
a<0.1.0
a>0.1.0
@ -1334,7 +1334,7 @@ fn requires_transitive_prerelease_and_stable_dependency() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because there is no version of c==2.0.0b1 and a==1.0.0 depends on c==2.0.0b1, we can conclude that a==1.0.0 is forbidden.
╰─▶ Because there is no version of c==2.0.0b1 and a==1.0.0 depends on c==2.0.0b1, we can conclude that a==1.0.0 cannot be used.
And because there are no versions of a that satisfy any of:
a<1.0.0
a>1.0.0
@ -1647,7 +1647,7 @@ fn requires_transitive_prerelease_and_stable_dependency_many_versions_holes() ->
c>1.0.0,<2.0.0a5
c>2.0.0a7,<2.0.0b1
c>2.0.0b1,<2.0.0b5
we can conclude that a==1.0.0 is forbidden.
we can conclude that a==1.0.0 cannot be used.
And because there are no versions of a that satisfy any of:
a<1.0.0
a>1.0.0
@ -2212,7 +2212,7 @@ fn requires_python_version_does_not_exist() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because there are no versions of Python that satisfy Python>=4.0 and a==1.0.0 depends on Python>=4.0, we can conclude that a==1.0.0 is forbidden.
╰─▶ Because there are no versions of Python that satisfy Python>=4.0 and a==1.0.0 depends on Python>=4.0, we can conclude that a==1.0.0 cannot be used.
And because root depends on a==1.0.0 we can conclude that the requirements are unsatisfiable.
"###);
});
@ -2269,7 +2269,7 @@ fn requires_python_version_less_than_current() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because there are no versions of Python that satisfy Python<=3.8 and a==1.0.0 depends on Python<=3.8, we can conclude that a==1.0.0 is forbidden.
╰─▶ Because there are no versions of Python that satisfy Python<=3.8 and a==1.0.0 depends on Python<=3.8, we can conclude that a==1.0.0 cannot be used.
And because root depends on a==1.0.0 we can conclude that the requirements are unsatisfiable.
"###);
});
@ -2329,7 +2329,7 @@ fn requires_python_version_greater_than_current() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because there are no versions of Python that satisfy Python>=3.10 and a==1.0.0 depends on Python>=3.10, we can conclude that a==1.0.0 is forbidden.
╰─▶ Because there are no versions of Python that satisfy Python>=3.10 and a==1.0.0 depends on Python>=3.10, we can conclude that a==1.0.0 cannot be used.
And because root depends on a==1.0.0 we can conclude that the requirements are unsatisfiable.
"###);
});
@ -2556,14 +2556,14 @@ fn requires_python_version_greater_than_current_excluded() -> Result<()> {
a>2.0.0,<3.0.0
a>3.0.0,<4.0.0
a>4.0.0
we can conclude that a>=2.0.0,<3.0.0 is forbidden. (1)
we can conclude that a>=2.0.0,<3.0.0 cannot be used. (1)
Because there are no versions of Python that satisfy Python>=3.11,<3.12 and there are no versions of Python that satisfy Python>=3.12, we can conclude that Python>=3.11 are incompatible.
And because a==3.0.0 depends on Python>=3.11 we can conclude that a==3.0.0 is forbidden.
And because we know from (1) that a>=2.0.0,<3.0.0 is forbidden, we can conclude that a>=2.0.0,<4.0.0 is forbidden. (2)
And because a==3.0.0 depends on Python>=3.11 we can conclude that a==3.0.0 cannot be used.
And because we know from (1) that a>=2.0.0,<3.0.0 cannot be used, we can conclude that a>=2.0.0,<4.0.0 cannot be used. (2)
Because there are no versions of Python that satisfy Python>=3.12 and a==4.0.0 depends on Python>=3.12, we can conclude that a==4.0.0 is forbidden.
And because we know from (2) that a>=2.0.0,<4.0.0 is forbidden, we can conclude that a>=2.0.0 is forbidden.
Because there are no versions of Python that satisfy Python>=3.12 and a==4.0.0 depends on Python>=3.12, we can conclude that a==4.0.0 cannot be used.
And because we know from (2) that a>=2.0.0,<4.0.0 cannot be used, we can conclude that a>=2.0.0 cannot be used.
And because root depends on a>=2.0.0 we can conclude that the requirements are unsatisfiable.
"###);
});

4
crates/puffin-resolver/src/pubgrub/report.rs
View file

@ -137,7 +137,7 @@ impl ReportFormatter<PubGrubPackage, Range<PubGrubVersion>> for PubGrubReportFor
.unwrap_or(&vec![])
.iter(),
);
format!("{} is forbidden", PackageRange::requires(package, &range))
format!("{} cannot be used", PackageRange::requires(package, &range))
}
[(package @ PubGrubPackage::Package(..), Term::Negative(range))] => {
let range = range.simplify(
@ -146,7 +146,7 @@ impl ReportFormatter<PubGrubPackage, Range<PubGrubVersion>> for PubGrubReportFor
.unwrap_or(&vec![])
.iter(),
);
format!("{} is mandatory", PackageRange::requires(package, &range))
format!("{} must be used", PackageRange::requires(package, &range))
}
[(p1, Term::Positive(r1)), (p2, Term::Negative(r2))] => self.format_external(
&External::FromDependencyOf((*p1).clone(), r1.clone(), (*p2).clone(), r2.clone()),

2
crates/puffin-resolver/tests/resolver.rs
View file

@ -650,7 +650,7 @@ async fn msgraph_sdk() -> Result<()> {
.unwrap_err();
assert_snapshot!(err, @r###"
Because there are no versions of msgraph-core that satisfy msgraph-core>=1.0.0a2 and msgraph-sdk==1.0.0 depends on msgraph-core>=1.0.0a2, we can conclude that msgraph-sdk==1.0.0 is forbidden.
Because there are no versions of msgraph-core that satisfy msgraph-core>=1.0.0a2 and msgraph-sdk==1.0.0 depends on msgraph-core>=1.0.0a2, we can conclude that msgraph-sdk==1.0.0 cannot be used.
And because root depends on msgraph-sdk==1.0.0 we can conclude that the requirements are unsatisfiable.
hint: msgraph-core was requested with a pre-release marker (e.g., msgraph-core>=1.0.0a2), but pre-releases weren't enabled (try: `--prerelease=allow`)