-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Fix subcommands accepting --version #14231
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
Open
7576457
wants to merge
7
commits into
pypa:main
Choose a base branch
from
7576457:fix/9456
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+23
−2
Open
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
67f9bb1
Fix subcommands accepting --version
7576457 df585d5
Add news
7576457 3e7a71b
Fix missing newline
7576457 59ef960
Hide --version option from subcommand help
7576457 e19dc3c
Restrict --version to top-level pip
7576457 a5ac891
Test rejection of --version for subcommands
7576457 8603802
Fix lint in base command tests
7576457 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Keep ``--version`` available only for pip and prevent its use in subcommands. |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
even with this check,
--versionstill shows up in the subcommand's--help.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, it stays in subcommands since
--versionlives ingeneral_group. I already tried removing it from there for the subcommand, but that broke some tests. Maybe there are other optionsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done.
found a way to suppress the hint without removing it :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One thing that feels a bit off to me.
current implementation adds special-case handling just for
--version. If possible, wouldn't it be better to avoid this kind of special case?--versionis only meaningful on the top-level pip command. So rather than keeping it ingeneral_group, defining and handling it only in the top-level parser seems like a more natural structure to me.That way:
--versionno longer shows up inpip <subcommand> --help--versioncan be handled consistently at the parser level.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My guess is the broken tests came from removing
versionfromgeneral_group.pip --versionitself could no longer be handled. Looking at the code where pip processes the top-level command might help.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Damn, yeah, agreed. Much better this way.
Found how to do it. I ll remove it from
general_optionsand add it as an option for pip, insteadThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done