diff --git a/crates/uv-distribution-types/src/annotation.rs b/crates/uv-distribution-types/src/annotation.rs index 673d23c17..593dff489 100644 --- a/crates/uv-distribution-types/src/annotation.rs +++ b/crates/uv-distribution-types/src/annotation.rs @@ -26,7 +26,11 @@ impl std::fmt::Display for SourceAnnotation { write!(f, "{project_name} ({})", path.portable_display()) } RequirementOrigin::Group(path, project_name, group) => { - write!(f, "{project_name} ({}:{group})", path.portable_display()) + write!( + f, + "{project_name} ({}::dependency-groups.{group})", + path.portable_display() + ) } RequirementOrigin::Workspace => { write!(f, "(workspace)") @@ -47,7 +51,7 @@ impl std::fmt::Display for SourceAnnotation { // Group is not used for override write!( f, - "--override {project_name} ({}:{group})", + "--override {project_name} ({}::dependency-groups.{group})", path.portable_display() ) } diff --git a/crates/uv/tests/it/pip_compile.rs b/crates/uv/tests/it/pip_compile.rs index 3ea6ffaf1..be9445870 100644 --- a/crates/uv/tests/it/pip_compile.rs +++ b/crates/uv/tests/it/pip_compile.rs @@ -15297,7 +15297,7 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group bar iniconfig==2.0.0 - # via myproject (pyproject.toml:bar) + # via myproject (pyproject.toml::dependency-groups.bar) ----- stderr ----- Resolved 1 package in [TIME] @@ -15316,7 +15316,7 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] pyproject.toml --group bar iniconfig==2.0.0 - # via myproject (pyproject.toml:bar) + # via myproject (pyproject.toml::dependency-groups.bar) typing-extensions==4.10.0 # via myproject (pyproject.toml) @@ -15335,7 +15335,7 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/pyproject.toml --group bar iniconfig==2.0.0 - # via myproject (pyproject.toml:bar) + # via myproject (pyproject.toml::dependency-groups.bar) typing-extensions==4.10.0 # via myproject (pyproject.toml) @@ -15353,7 +15353,7 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group pyproject.toml:bar iniconfig==2.0.0 - # via myproject (pyproject.toml:bar) + # via myproject (pyproject.toml::dependency-groups.bar) ----- stderr ----- Resolved 1 package in [TIME] @@ -15370,7 +15370,7 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] pyproject.toml --group pyproject.toml:bar iniconfig==2.0.0 - # via myproject (pyproject.toml:bar) + # via myproject (pyproject.toml::dependency-groups.bar) typing-extensions==4.10.0 # via myproject (pyproject.toml) @@ -15388,7 +15388,7 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group foo sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 1 package in [TIME] @@ -15405,9 +15405,9 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group foo --group bar iniconfig==2.0.0 - # via myproject (pyproject.toml:bar) + # via myproject (pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15425,9 +15425,9 @@ fn dependency_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] pyproject.toml --group foo --group bar iniconfig==2.0.0 - # via myproject (pyproject.toml:bar) + # via myproject (pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) typing-extensions==4.10.0 # via myproject (pyproject.toml) @@ -15488,7 +15488,7 @@ fn many_pyproject_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group pyproject.toml:foo sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 1 package in [TIME] @@ -15503,7 +15503,7 @@ fn many_pyproject_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group subdir/pyproject.toml:foo iniconfig==2.0.0 - # via mysubproject (subdir/pyproject.toml:foo) + # via mysubproject (subdir/pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 1 package in [TIME] @@ -15521,9 +15521,9 @@ fn many_pyproject_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group pyproject.toml:foo --group subdir/pyproject.toml:foo iniconfig==2.0.0 - # via mysubproject (subdir/pyproject.toml:foo) + # via mysubproject (subdir/pyproject.toml::dependency-groups.foo) sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15584,9 +15584,9 @@ fn suspicious_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group foo --group subdir/pyproject.toml:foo iniconfig==2.0.0 - # via mysubproject (subdir/pyproject.toml:foo) + # via mysubproject (subdir/pyproject.toml::dependency-groups.foo) sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15605,9 +15605,9 @@ fn suspicious_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --group foo --group subdir/pyproject.toml:bar sniffio==1.3.1 - # via mysubproject (subdir/pyproject.toml:bar) + # via mysubproject (subdir/pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15627,7 +15627,7 @@ fn suspicious_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] subdir/pyproject.toml --group foo sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) typing-extensions==4.10.0 # via mysubproject (subdir/pyproject.toml) @@ -15647,7 +15647,7 @@ fn suspicious_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] pyproject.toml --group subdir/pyproject.toml:foo iniconfig==2.0.0 - # via mysubproject (subdir/pyproject.toml:foo) + # via mysubproject (subdir/pyproject.toml::dependency-groups.foo) typing-extensions==4.10.0 # via myproject (pyproject.toml) @@ -15804,7 +15804,7 @@ fn project_and_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --project subdir --group foo iniconfig==2.0.0 - # via mysubproject (subdir/pyproject.toml:foo) + # via mysubproject (subdir/pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 1 package in [TIME] @@ -15824,9 +15824,9 @@ fn project_and_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --project subdir --group subdir/pyproject.toml:bar --group foo iniconfig==2.0.0 - # via mysubproject (subdir/pyproject.toml:foo) + # via mysubproject (subdir/pyproject.toml::dependency-groups.foo) sniffio==1.3.1 - # via mysubproject (subdir/pyproject.toml:bar) + # via mysubproject (subdir/pyproject.toml::dependency-groups.bar) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15846,9 +15846,9 @@ fn project_and_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --project subdir --group bar --group pyproject.toml:foo sniffio==1.3.1 - # via mysubproject (subdir/pyproject.toml:bar) + # via mysubproject (subdir/pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15868,9 +15868,9 @@ fn project_and_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --project subdir --group subdir/pyproject.toml:bar --group pyproject.toml:foo sniffio==1.3.1 - # via mysubproject (subdir/pyproject.toml:bar) + # via mysubproject (subdir/pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject (pyproject.toml:foo) + # via myproject (pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15932,9 +15932,9 @@ fn directory_and_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --directory subdir --group bar --group ../pyproject.toml:foo sniffio==1.3.1 - # via mysubproject (pyproject.toml:bar) + # via mysubproject (pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject (../pyproject.toml:foo) + # via myproject (../pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15954,9 +15954,9 @@ fn directory_and_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --directory subdir --group pyproject.toml:bar --group ../pyproject.toml:foo sniffio==1.3.1 - # via mysubproject (pyproject.toml:bar) + # via mysubproject (pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject (../pyproject.toml:foo) + # via myproject (../pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME] @@ -15977,9 +15977,9 @@ fn directory_and_group() -> Result<()> { # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] --directory subdir --project ../ --group pyproject.toml:bar --group foo sniffio==1.3.1 - # via mysubproject (pyproject.toml:bar) + # via mysubproject (pyproject.toml::dependency-groups.bar) sortedcontainers==2.4.0 - # via myproject ([TEMP_DIR]/pyproject.toml:foo) + # via myproject ([TEMP_DIR]/pyproject.toml::dependency-groups.foo) ----- stderr ----- Resolved 2 packages in [TIME]