Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cli): conflict --locked with --upgrade #10836

Merged
merged 1 commit into from
Jan 22, 2025

Conversation

mkniewallner
Copy link
Contributor

Summary

Relates to #10273.

This doesn't solve what is highlighted in #10273 (comment), but I believe this is still an improvement for users not setting upgrade = true in [tool.uv].

Test Plan

Ran commands locally:

$ cargo run --quiet -- lock --locked --upgrade
error: the argument '--check' cannot be used with '--upgrade'

Usage: uv lock --check

For more information, try '--help'.

@mkniewallner mkniewallner marked this pull request as ready for review January 22, 2025 01:38
@zanieb zanieb merged commit dc637d0 into astral-sh:main Jan 22, 2025
68 checks passed
@zanieb zanieb added the bug Something isn't working label Jan 22, 2025
@mkniewallner mkniewallner deleted the fix/conflict-locked-upgrade branch January 22, 2025 03:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants