Repository navigation
pip compile: exclude --upgrade-package when option and value are passed as a single argument - #5033
Merged
charliermarsh merged 2 commits intoJul 13, 2024
Conversation
…ssed in a single argument
skshetry
commented
Jul 13, 2024
charliermarsh
approved these changes
Jul 13, 2024
Member
|
Thank you! |
charliermarsh
pushed a commit
that referenced
this pull request
Jul 16, 2024
) I messed up the order of checks in #5033, due to which it failed to exclude the case of `-P package`, as `arg.startswith("-P")` check came first and skipped only the first argument. That means that, in the following command: ```console uv pip compile --output-file pip_compile_uv_header.txt unpinned_uv.in -P attrs==18.1.0 ``` The generated header would exclude `-P`, but keep `attrs==18.1.0`. ```plaintext # This file was autogenerated by uv via the following command: # uv pip compile --output-file pip_compile_uv_header.txt unpinned_uv.in attrs==18.1.0 ``` But we want to check for an exact match first and then only check for the case when option and value are together. This also affected `--find-links` short option of style `-f <uri>`. Hopefully, third times going to be a charm. 😳 <!-- Thank you for contributing to uv! To help us out with reviewing, please consider the following: - Does this pull request include a summary of the change? (See below.) - Does this pull request include a descriptive title? - Does this pull request include references to any relevant issues? --> ## Summary <!-- What's the purpose of the change? What does it do, and why? --> ## Test Plan <!-- How was it tested? --> I tested locally, and also changed one snapshot test to use `-P` for variation. I don't think it's worth an extra test, but can do that for sure.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This excludes
--upgrade-packagefromcompile_commandwhen value and option are passed as a single argument. Eg:I missed this on #5032.
Fixes #5031.
Test Plan
Tested locally