Running `uv lock --check` with outdated lockfile will print that `--check` was passed, instead of `--locked` by cmnemoi · Pull Request #16322 · astral-sh/uv

cmnemoi · 2025-10-15T18:27:38Z

Hello,

Summary

This PR fixes the confusing error message when running uv lock --check with an outdated lockfile.

Previously, the error message incorrectly stated that --locked was provided, even when the user used --check.

Now, the error message correctly indicates which flag was used: either --check or --locked.

This closes #14105.

Test plan

I updated the existing integration test (check_outdated_lock in lock.rs) to verify the new error message includes the correct flag.
I ran existing tests to ensure I have no introduced regressions for other commands.

… `--check` or `--locked` was passed, instead of `--locked` only

zanieb · 2025-10-15T23:06:08Z

I was imaging instead setting up a type like Mode::Lock | Mode::Check(CheckSource::Check | CheckSource::Locked) instead of a bool so we can report this value appropriately?

sort of like

uv/crates/uv/src/commands/tool/run.rs

Lines 65 to 72 in b4168e6

    
           /// The user-facing command used to invoke a tool run. 
        
           #[derive(Debug, Copy, Clone, PartialEq, Eq)] 
        
           pub(crate) enum ToolRunCommand { 
        
               /// via the `uvx` alias 
        
               Uvx, 
        
               /// via `uv tool run` 
        
               ToolRun, 
        
           }

or

uv/crates/uv/src/commands/python/install.rs

Lines 153 to 176 in 13a976a

    
           #[derive(Debug, Clone, Copy)] 
        
           pub(crate) enum PythonUpgradeSource { 
        
               /// The user invoked `uv python install --upgrade` 
        
               Install, 
        
               /// The user invoked `uv python upgrade` 
        
               Upgrade, 
        
           } 
        
           impl std::fmt::Display for PythonUpgradeSource { 
        
               fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { 
        
                   match self { 
        
                       Self::Install => write!(f, "uv python install --upgrade"), 
        
                       Self::Upgrade => write!(f, "uv python upgrade"), 
        
                   } 
        
               } 
        
           } 
        
           #[derive(Debug, Clone, Copy)] 
        
           pub(crate) enum PythonUpgrade { 
        
               /// Python upgrades are enabled. 
        
               Enabled(PythonUpgradeSource), 
        
               /// Python upgrades are disabled. 
        
               Disabled, 
        
           }

…ght flag which prevented `uv` command to run on outdated lockfile.

…tter semantic

cmnemoi · 2025-10-16T07:15:07Z

@zanieb Thanks for the review, I applied necessary changes.

konstin

Thank you!

zanieb · 2025-10-21T13:47:57Z

crates/uv-cli/src/lib.rs

+    /// 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"])]


We should hide this one, I think.

zanieb · 2025-10-21T13:49:15Z

crates/uv/src/commands/project/add.rs

+        if matches!(lock_check, LockCheck::Enabled(_)) {
            warn_user_once!(
                "`--locked` is a no-op for Python scripts with inline metadata, which always run in isolation"
            );


Shouldn't we use the source in this warning message?

(there are some more instances of this following)

zanieb · 2025-10-21T13:50:04Z

crates/uv/src/commands/project/add.rs

+        if matches!(lock_check, LockCheck::Enabled(_)) {
+            LockMode::Locked(target.interpreter(), lock_check.source().unwrap())


We should use if let LockCheck::Enabled(source) = lock_check { so you can avoid the unwrap

(there are some more instances of this following)

zanieb · 2025-10-21T13:52:35Z

crates/uv/tests/it/lock.rs

 fn check_outdated_lock() -> Result<()> {
+    // Given a test context with a pyproject.toml
    let context = TestContext::new("3.12");


I'm a bit confused that the setup for this test case changed. Why did it?

This is from my old implementation.

I badly reverted the test case I added for that, I will fix that.

zanieb · 2025-10-21T13:53:15Z

Nice! That's what I had in mind :)

…k` one (but needed to get lock source)

…tead

cmnemoi · 2025-10-21T15:01:26Z

@zanieb Thanks for the insightful review again, I applied needed changes 👍

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.9.5` -> `0.9.7` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.9.7`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#097) [Compare Source](astral-sh/uv@0.9.6...0.9.7) Released on 2025-10-30. ##### Enhancements - Add Windows x86-32 emulation support to interpreter architecture checks ([#13475](astral-sh/uv#13475)) - Improve readability of progress bars ([#16509](astral-sh/uv#16509)) - Add GitHub attestations for uv release artifacts ([#11357](astral-sh/uv#11357)) ##### Bug fixes - Drop terminal coloring from `uv auth token` output ([#16504](astral-sh/uv#16504)) - Don't use UV\_LOCKED to enable `--check` flag ([#16521](astral-sh/uv#16521)) ### [`v0.9.6`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#096) [Compare Source](astral-sh/uv@0.9.5...0.9.6) Released on 2025-10-29. This release contains an upgrade to Astral's fork of `async_zip`, which addresses potential sources of ZIP parsing differentials between uv and other Python packaging tooling. See [GHSA-pqhf-p39g-3x64](GHSA-pqhf-p39g-3x64) for additional details. ##### Security - Address ZIP parsing differentials ([GHSA-pqhf-p39g-3x64](GHSA-pqhf-p39g-3x64)) ##### Python - Upgrade GraalPy to 25.0.1 ([#16401](astral-sh/uv#16401)) ##### Enhancements - Add `--clear` to `uv build` to remove old build artifacts ([#16371](astral-sh/uv#16371)) - Add `--no-create-gitignore` to `uv build` ([#16369](astral-sh/uv#16369)) - Do not error when a virtual environment directory cannot be removed due to a busy error ([#16394](astral-sh/uv#16394)) - Improve hint on `pip install --system` when externally managed ([#16392](astral-sh/uv#16392)) - Running `uv lock --check` with outdated lockfile will print that `--check` was passed, instead of `--locked` ([#16322](astral-sh/uv#16322)) - Update `uv init` template for Maturin ([#16449](astral-sh/uv#16449)) - Improve ordering of Python sources in logs ([#16463](astral-sh/uv#16463)) - Restore DockerHub release images and annotations ([#16441](astral-sh/uv#16441)) ##### Bug fixes - Check for matching Python implementation during `uv python upgrade` ([#16420](astral-sh/uv#16420)) - Deterministically order `--find-links` distributions ([#16446](astral-sh/uv#16446)) - Don't panic in `uv export --frozen` when the lockfile is outdated ([#16407](astral-sh/uv#16407)) - Fix root of `uv tree` when `--package` is used with circular dependencies ([#15908](astral-sh/uv#15908)) - Show package list with `pip freeze --quiet` ([#16491](astral-sh/uv#16491)) - Limit `uv auth login pyx.dev` retries to 60s ([#16498](astral-sh/uv#16498)) - Add an empty group with `uv add --group ... -r ...` ([#16490](astral-sh/uv#16490)) ##### Documentation - Update docs for maturin build backend init template ([#16469](astral-sh/uv#16469)) - Update docs to reflect previous changes to signal forwarding semantics ([#16430](astral-sh/uv#16430)) - Add instructions for installing via MacPorts ([#16039](astral-sh/uv#16039)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

cmnemoi added 2 commits October 15, 2025 20:24

fix: Running uv lock --check with outdated lockfile will print that…

c665c4e

… `--check` or `--locked` was passed, instead of `--locked` only

fix: Display --check or --locked was passed only for uv lock command

9686f05

cmnemoi mentioned this pull request Oct 15, 2025

confusing error message for uv lock --check #14105

Closed

cmnemoi added 2 commits October 16, 2025 09:01

feat: Get LockCheckSource from LockArgs, so we can display the ri…

ebc468c

…ght flag which prevented `uv` command to run on outdated lockfile.

refactor: rename locked argument to lock_check in commands for be…

1a7bcd5

…tter semantic

docs: Regenerate CLI documentation

ad27e67

cmnemoi changed the title ~~fix: Running uv lock --check with outdated lockfile will print that --check or --locked was passed, instead of --locked only~~ fix: Running uv lock --check with outdated lockfile will print that --check was passed, instead of --locked Oct 16, 2025

test: Update tests accordingly to changes

070c471

konstin changed the title ~~fix: Running uv lock --check with outdated lockfile will print that --check was passed, instead of --locked~~ Running uv lock --check with outdated lockfile will print that --check was passed, instead of --locked Oct 20, 2025

konstin added the error messages Messaging when something goes wrong label Oct 21, 2025

konstin approved these changes Oct 21, 2025

View reviewed changes

zanieb reviewed Oct 21, 2025

View reviewed changes

cmnemoi added 5 commits October 21, 2025 16:03

fix: Hide uv lock --locked flag as it's already an alias of `--chec…

19d4e39

…k` one (but needed to get lock source)

fix: All messages refering to --locked refer to the lock source ins…

12110b0

…tead

refactor: simplify lock_check passing with if let

547ddf0

revert: Revert to old test scenario

777c305

docs: Regenerate CLI docs

2fe8781

zanieb approved these changes Oct 21, 2025

View reviewed changes

zanieb merged commit 225bffb into astral-sh:main Oct 21, 2025
96 of 99 checks passed

BrewTestBot mentioned this pull request Oct 29, 2025

uv 0.9.6 Homebrew/homebrew-core#251856

Merged

AlexVndnblcke mentioned this pull request Oct 30, 2025

UV_LOCKED enables both --check and --locked #16517

Closed

		if matches!(lock_check, LockCheck::Enabled(_)) {
		LockMode::Locked(target.interpreter(), lock_check.source().unwrap())

Comments

Conversation

cmnemoi commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

zanieb commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmnemoi commented Oct 16, 2025

Uh oh!

konstin left a comment

Choose a reason for hiding this comment

Uh oh!

zanieb Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zanieb Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zanieb Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zanieb Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zanieb Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zanieb Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

cmnemoi Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

zanieb commented Oct 21, 2025

Uh oh!

cmnemoi commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

cmnemoi commented Oct 15, 2025 •

edited

Loading

zanieb commented Oct 15, 2025 •

edited

Loading

cmnemoi commented Oct 21, 2025 •

edited

Loading