Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display "and" instead of "," in bound intersections

This commit is contained in:
Zanie 2024-01-10 15:07:00 -06:00
parent d47eeccca8
commit 68abd0d2c7
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/puffin-cli/tests/pip_compile.rs
View File

@ -2233,9 +2233,9 @@ fn compile_yanked_version_indirect() -> Result<()> {
----- stderr ----- ----- stderr -----
× No solution found when resolving dependencies: × No solution found when resolving dependencies:
╰─▶ Because there are no versions of attrs that satisfy attrs>20.3.0,<21.2.0 ╰─▶ Because there are no versions of attrs that satisfy attrs>20.3.0 and
and root depends on attrs>20.3.0,<21.2.0, we can conclude that the attrs<21.2.0 and root depends on attrs>20.3.0 and attrs<21.2.0, we can
requirements are unsatisfiable. conclude that the requirements are unsatisfiable.
"###); "###);
}); });

54
crates/puffin-cli/tests/pip_install_scenarios.rs
View File

@ -158,8 +158,8 @@ fn excluded_only_compatible_version() -> Result<()> {
× No solution found when resolving dependencies: × No solution found when resolving dependencies:
╰─▶ Because there are no versions of a that satisfy any of: ╰─▶ Because there are no versions of a that satisfy any of:
a<1.0.0 a<1.0.0
a>1.0.0,<2.0.0 a>1.0.0 and a<2.0.0
a>2.0.0,<3.0.0 a>2.0.0 and a<3.0.0
a>3.0.0 a>3.0.0
and a==1.0.0 depends on b==1.0.0, we can conclude that a<2.0.0 depends on b==1.0.0. and a==1.0.0 depends on b==1.0.0, we can conclude that a<2.0.0 depends on b==1.0.0.
And because a==3.0.0 depends on b==3.0.0 we can conclude that any of: And because a==3.0.0 depends on b==3.0.0 we can conclude that any of:
@ -169,7 +169,7 @@ fn excluded_only_compatible_version() -> Result<()> {
b<=1.0.0 b<=1.0.0
b>=3.0.0 b>=3.0.0
And because root depends on b>=2.0.0,<3.0.0 and root depends on one of: And because root depends on b>=2.0.0 and b<3.0.0 and root depends on one of:
a<2.0.0 a<2.0.0
a>2.0.0 a>2.0.0
we can conclude that the requirements are unsatisfiable. we can conclude that the requirements are unsatisfiable.
@ -280,13 +280,13 @@ fn dependency_excludes_range_of_compatible_versions() -> Result<()> {
× No solution found when resolving dependencies: × No solution found when resolving dependencies:
╰─▶ Because there are no versions of a that satisfy any of: ╰─▶ Because there are no versions of a that satisfy any of:
a<1.0.0 a<1.0.0
a>1.0.0,<2.0.0 a>1.0.0 and a<2.0.0
a>3.0.0 a>3.0.0
and a==1.0.0 depends on b==1.0.0, we can conclude that a<2.0.0 depends on b==1.0.0. (1) and a==1.0.0 depends on b==1.0.0, we can conclude that a<2.0.0 depends on b==1.0.0. (1)
Because there are no versions of c that satisfy any of: Because there are no versions of c that satisfy any of:
c<1.0.0 c<1.0.0
c>1.0.0,<2.0.0 c>1.0.0 and c<2.0.0
c>2.0.0 c>2.0.0
and c==1.0.0 depends on a<2.0.0, we can conclude that c<2.0.0 depends on a<2.0.0. and c==1.0.0 depends on a<2.0.0, we can conclude that c<2.0.0 depends on a<2.0.0.
And because c==2.0.0 depends on a>=3.0.0 we can conclude that all versions of c depends on one of: And because c==2.0.0 depends on a>=3.0.0 we can conclude that all versions of c depends on one of:
@ -298,7 +298,7 @@ fn dependency_excludes_range_of_compatible_versions() -> Result<()> {
b<=1.0.0 b<=1.0.0
b>=3.0.0 b>=3.0.0
And because root depends on c and root depends on b>=2.0.0,<3.0.0, we can conclude that the requirements are unsatisfiable. And because root depends on c and root depends on b>=2.0.0 and b<3.0.0, we can conclude that the requirements are unsatisfiable.
"###); "###);
}); });
@ -422,7 +422,7 @@ fn dependency_excludes_non_contiguous_range_of_compatible_versions() -> Result<(
× No solution found when resolving dependencies: × No solution found when resolving dependencies:
╰─▶ Because a==1.0.0 depends on b==1.0.0 and there are no versions of a that satisfy any of: ╰─▶ Because a==1.0.0 depends on b==1.0.0 and there are no versions of a that satisfy any of:
a<1.0.0 a<1.0.0
a>1.0.0,<2.0.0 a>1.0.0 and a<2.0.0
a>3.0.0 a>3.0.0
we can conclude that a<2.0.0 depends on b==1.0.0. we can conclude that a<2.0.0 depends on b==1.0.0.
And because a==3.0.0 depends on b==3.0.0 we can conclude that any of: And because a==3.0.0 depends on b==3.0.0 we can conclude that any of:
@ -435,7 +435,7 @@ fn dependency_excludes_non_contiguous_range_of_compatible_versions() -> Result<(
Because there are no versions of c that satisfy any of: Because there are no versions of c that satisfy any of:
c<1.0.0 c<1.0.0
c>1.0.0,<2.0.0 c>1.0.0 and c<2.0.0
c>2.0.0 c>2.0.0
and c==1.0.0 depends on a<2.0.0, we can conclude that c<2.0.0 depends on a<2.0.0. and c==1.0.0 depends on a<2.0.0, we can conclude that c<2.0.0 depends on a<2.0.0.
And because c==2.0.0 depends on a>=3.0.0 we can conclude that all versions of c depends on one of: And because c==2.0.0 depends on a>=3.0.0 we can conclude that all versions of c depends on one of:
@ -452,7 +452,7 @@ fn dependency_excludes_non_contiguous_range_of_compatible_versions() -> Result<(
b<=1.0.0 b<=1.0.0
b>=3.0.0 b>=3.0.0
And because root depends on b>=2.0.0,<3.0.0 and root depends on c, we can conclude that the requirements are unsatisfiable. And because root depends on b>=2.0.0 and b<3.0.0 and root depends on c, we can conclude that the requirements are unsatisfiable.
"###); "###);
}); });
@ -1640,13 +1640,13 @@ fn requires_transitive_prerelease_and_stable_dependency_many_versions_holes() ->
----- stderr ----- ----- stderr -----
× No solution found when resolving dependencies: × No solution found when resolving dependencies:
╰─▶ Because there are no versions of c that satisfy any of: ╰─▶ Because there are no versions of c that satisfy any of:
c>1.0.0,<2.0.0a5 c>1.0.0 and c<2.0.0a5
c>2.0.0a7,<2.0.0b1 c>2.0.0a7 and c<2.0.0b1
c>2.0.0b1,<2.0.0b5 c>2.0.0b1 and c<2.0.0b5
and a==1.0.0 depends on one of: and a==1.0.0 depends on one of:
c>1.0.0,<2.0.0a5 c>1.0.0 and c<2.0.0a5
c>2.0.0a7,<2.0.0b1 c>2.0.0a7 and c<2.0.0b1
c>2.0.0b1,<2.0.0b5 c>2.0.0b1 and c<2.0.0b5
we can conclude that a==1.0.0 cannot be used. we can conclude that a==1.0.0 cannot be used.
And because there are no versions of a that satisfy any of: And because there are no versions of a that satisfy any of:
a<1.0.0 a<1.0.0
@ -1654,9 +1654,9 @@ fn requires_transitive_prerelease_and_stable_dependency_many_versions_holes() ->
and root depends on a, we can conclude that the requirements are unsatisfiable. and root depends on a, we can conclude that the requirements are unsatisfiable.
hint: c was requested with a pre-release marker (e.g., any of: hint: c was requested with a pre-release marker (e.g., any of:
c>1.0.0,<2.0.0a5 c>1.0.0 and c<2.0.0a5
c>2.0.0a7,<2.0.0b1 c>2.0.0a7 and c<2.0.0b1
c>2.0.0b1,<2.0.0b5 c>2.0.0b1 and c<2.0.0b5
), but pre-releases weren't enabled (try: `--prerelease=allow`) ), but pre-releases weren't enabled (try: `--prerelease=allow`)
"###); "###);
}); });
@ -2547,23 +2547,23 @@ fn requires_python_version_greater_than_current_excluded() -> Result<()> {
----- stderr ----- ----- stderr -----
× No solution found when resolving dependencies: × No solution found when resolving dependencies:
╰─▶ Because there are no versions of Python that satisfy Python>=3.10,<3.11 and there are no versions of Python that satisfy Python>=3.12, we can conclude that any of: ╰─▶ Because there are no versions of Python that satisfy Python>=3.10 and Python<3.11 and there are no versions of Python that satisfy Python>=3.12, we can conclude that any of:
Python>=3.10,<3.11 Python>=3.10 and Python<3.11
Python>=3.12 Python>=3.12
are incompatible. are incompatible.
And because there are no versions of Python that satisfy Python>=3.11,<3.12 we can conclude that Python>=3.10 are incompatible. And because there are no versions of Python that satisfy Python>=3.11 and Python<3.12 we can conclude that Python>=3.10 are incompatible.
And because a==2.0.0 depends on Python>=3.10 and there are no versions of a that satisfy any of: And because a==2.0.0 depends on Python>=3.10 and there are no versions of a that satisfy any of:
a>2.0.0,<3.0.0 a>2.0.0 and a<3.0.0
a>3.0.0,<4.0.0 a>3.0.0 and a<4.0.0
a>4.0.0 a>4.0.0
we can conclude that a>=2.0.0,<3.0.0 cannot be used. (1) we can conclude that a>=2.0.0 and a<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. Because there are no versions of Python that satisfy Python>=3.11 and Python<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 cannot be used. 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) And because we know from (1) that a>=2.0.0 and a<3.0.0 cannot be used, we can conclude that a>=2.0.0 and a<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 cannot be used. 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 we know from (2) that a>=2.0.0 and a<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. And because root depends on a>=2.0.0 we can conclude that the requirements are unsatisfiable.
"###); "###);
}); });

14
crates/puffin-resolver/src/pubgrub/report.rs
View File

@ -486,13 +486,19 @@ impl std::fmt::Display for PackageRange<'_> {
if v == b { if v == b {
write!(f, "{package}=={v}")?; write!(f, "{package}=={v}")?;
} else { } else {
write!(f, "{package}>={v},<={b}")?; write!(f, "{package}>={v} and {package}<={b}")?;
} }
} }
(Bound::Included(v), Bound::Excluded(b)) => write!(f, "{package}>={v},<{b}")?, (Bound::Included(v), Bound::Excluded(b)) => {
write!(f, "{package}>={v} and {package}<{b}")?;
}
(Bound::Excluded(v), Bound::Unbounded) => write!(f, "{package}>{v}")?, (Bound::Excluded(v), Bound::Unbounded) => write!(f, "{package}>{v}")?,
(Bound::Excluded(v), Bound::Included(b)) => write!(f, "{package}>{v},<={b}")?, (Bound::Excluded(v), Bound::Included(b)) => {
(Bound::Excluded(v), Bound::Excluded(b)) => write!(f, "{package}>{v},<{b}")?, write!(f, "{package}>{v} and {package}<={b}")?;
}
(Bound::Excluded(v), Bound::Excluded(b)) => {
write!(f, "{package}>{v} and {package}<{b}")?;
}
}; };
} }
if segments.len() > 1 { if segments.len() > 1 {