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

Show 'depends on itself' for proxy packages (#9717)

Browse source
This commit is contained in:
Charlie Marsh 2024-12-10 09:48:26 -05:00 • committed by GitHub
parent cb038582b9
commit 4c334e67a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,11 +134,11 @@ impl ReportFormatter<PubGrubPackage, Range<Version>, UnavailableReason>
let package_set = self.simplify_set(package_set, package);
let dependency_set = self.simplify_set(dependency_set, dependency);
if package == dependency {
if package.name_no_root() == dependency.name_no_root() {
if let Some(member) = self.format_workspace_member(package) {
return format!(
"{member} depends on itself at an incompatible version ({})",
PackageRange::dependency(package, &dependency_set, None)
PackageRange::dependency(dependency, &dependency_set, None)
);
}
}

8
crates/uv/tests/it/lock.rs
View file

@ -19660,7 +19660,7 @@ fn lock_self_extra_to_same_extra_incompatible() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because project[foo] depends on your project and your project requires project[foo], we can conclude that your project's requirements are unsatisfiable.
╰─▶ Because project[foo] depends on itself at an incompatible version (project==0.2.0) and your project requires project[foo], we can conclude that your project's requirements are unsatisfiable.
hint: The package `project[foo]` depends on itself at an incompatible version. This is likely a mistake. Consider removing the dependency.
"###);
@ -19694,7 +19694,7 @@ fn lock_self_extra_to_other_extra_incompatible() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because project[foo] depends on your project and your project requires project[foo], we can conclude that your project's requirements are unsatisfiable.
╰─▶ Because project[foo] depends on itself at an incompatible version (project==0.2.0) and your project requires project[foo], we can conclude that your project's requirements are unsatisfiable.
hint: The package `project[foo]` depends on itself at an incompatible version. This is likely a mistake. Consider removing the dependency.
"###);
@ -19829,7 +19829,7 @@ fn lock_self_extra_incompatible() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because project[foo] depends on your project and your project requires project[foo], we can conclude that your project's requirements are unsatisfiable.
╰─▶ Because project[foo] depends on itself at an incompatible version (project==0.2.0) and your project requires project[foo], we can conclude that your project's requirements are unsatisfiable.
hint: The package `project[foo]` depends on itself at an incompatible version. This is likely a mistake. Consider removing the dependency.
"###);
@ -19958,7 +19958,7 @@ fn lock_self_marker_incompatible() -> Result<()> {
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only project{sys_platform == 'win32'}<=0.1 is available and your project depends on project{sys_platform == 'win32'}>0.1, we can conclude that your project's requirements are unsatisfiable.
╰─▶ Because only project{sys_platform == 'win32'}<=0.1 is available and your project depends on itself at an incompatible version (project{sys_platform == 'win32'}>0.1), we can conclude that your project's requirements are unsatisfiable.
hint: The package `project` depends on itself at an incompatible version. This is likely a mistake. Consider removing the dependency.
"###);