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

Allow `--check` and `--locked` to be used together in `uv lock` (#16538) 

See https://github.com/astral-sh/uv/issues/16517#issuecomment-3473747461
This commit is contained in:
Zanie Blue 2025-10-31 13:11:34 -05:00 committed by GitHub
parent 1e2ec4a50c
commit 101d0e2892
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/uv-cli/src/lib.rs
View File

@ -3753,7 +3753,7 @@ pub struct LockArgs {
/// missing or needs to be updated, uv will exit with an error.
///
/// Equivalent to `--locked`.
#[arg(long, value_parser = clap::builder::BoolishValueParser::new(), conflicts_with_all = ["check_exists", "upgrade", "locked"])]
#[arg(long, value_parser = clap::builder::BoolishValueParser::new(), conflicts_with_all = ["check_exists", "upgrade"], overrides_with = "check")]
pub check: bool,
/// Check if the lockfile is up-to-date.
@ -3762,7 +3762,7 @@ pub struct LockArgs {
/// missing or needs to be updated, uv will exit with an error.
///
/// Equivalent to `--check`.
#[arg(long, env = EnvVars::UV_LOCKED, value_parser = clap::builder::BoolishValueParser::new(), conflicts_with_all = ["check_exists", "upgrade", "check"], hide = true)]
#[arg(long, env = EnvVars::UV_LOCKED, value_parser = clap::builder::BoolishValueParser::new(), conflicts_with_all = ["check_exists", "upgrade"], hide = true)]
pub locked: bool,
/// Assert that a `uv.lock` exists without checking if it is up-to-date.

13
crates/uv/tests/it/lock.rs
View File

@ -13392,6 +13392,19 @@ fn check_outdated_lock() -> Result<()> {
Resolved 2 packages in [TIME]
The lockfile at `uv.lock` needs to be updated, but `--check` was provided. To update the lockfile, run `uv lock`.
");
// Providing both `--check` and `--locked` is okay
uv_snapshot!(context.filters(), context.lock()
.arg("--check").arg("--locked"), @r"
success: false
exit_code: 1
----- stdout -----
----- stderr -----
Resolved 2 packages in [TIME]
The lockfile at `uv.lock` needs to be updated, but `--check` was provided. To update the lockfile, run `uv lock`.
");
Ok(())
}