From 628eedea36914c6abbda8f6ca5a4807781d16f43 Mon Sep 17 00:00:00 2001 From: Alyssa Coghlan Date: Fri, 10 Oct 2025 03:38:18 +1000 Subject: [PATCH] Fix pylock.toml config conflict error messages (#16211) ## Summary When specifying constraints or overrides in combination with `pylock.toml` as an input to `uv pip install`, the error messages are not currently correct. ## Test Plan No testing, it's a straightforward error string fix. --------- Co-authored-by: Zanie Blue --- crates/uv-requirements/src/specification.rs | 4 ++-- crates/uv/tests/it/pip_install.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/uv-requirements/src/specification.rs b/crates/uv-requirements/src/specification.rs index 67984a11b..80a3c35ea 100644 --- a/crates/uv-requirements/src/specification.rs +++ b/crates/uv-requirements/src/specification.rs @@ -397,12 +397,12 @@ impl RequirementsSpecification { } if !constraints.is_empty() { return Err(anyhow::anyhow!( - "Cannot specify additional requirements with a `pylock.toml` file" + "Cannot specify constraints with a `pylock.toml` file" )); } if !overrides.is_empty() { return Err(anyhow::anyhow!( - "Cannot specify constraints with a `pylock.toml` file" + "Cannot specify overrides with a `pylock.toml` file" )); } diff --git a/crates/uv/tests/it/pip_install.rs b/crates/uv/tests/it/pip_install.rs index 4d3312d68..1255a77a1 100644 --- a/crates/uv/tests/it/pip_install.rs +++ b/crates/uv/tests/it/pip_install.rs @@ -11442,7 +11442,7 @@ fn pep_751_mix() -> Result<()> { ----- stdout ----- ----- stderr ----- - error: Cannot specify additional requirements with a `pylock.toml` file + error: Cannot specify constraints with a `pylock.toml` file " );