mirror of https://github.com/astral-sh/uv
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 <contact@zanie.dev>
This commit is contained in:
parent
a58d031157
commit
628eedea36
|
|
@ -397,12 +397,12 @@ impl RequirementsSpecification {
|
||||||
}
|
}
|
||||||
if !constraints.is_empty() {
|
if !constraints.is_empty() {
|
||||||
return Err(anyhow::anyhow!(
|
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() {
|
if !overrides.is_empty() {
|
||||||
return Err(anyhow::anyhow!(
|
return Err(anyhow::anyhow!(
|
||||||
"Cannot specify constraints with a `pylock.toml` file"
|
"Cannot specify overrides with a `pylock.toml` file"
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11442,7 +11442,7 @@ fn pep_751_mix() -> Result<()> {
|
||||||
----- stdout -----
|
----- stdout -----
|
||||||
|
|
||||||
----- stderr -----
|
----- stderr -----
|
||||||
error: Cannot specify additional requirements with a `pylock.toml` file
|
error: Cannot specify constraints with a `pylock.toml` file
|
||||||
"
|
"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue