Move native options parsing out of the legacy Parser #21652
Merged
+56
−64
Conversation
This file contains 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
benjyw
commented
Nov 15, 2024
| @@ -410,8 +416,47 @@ def for_scope( | |||
| :return: An OptionValueContainer representing the option values for the given scope. | |||
| :raises pants.option.errors.ConfigValidationError: if the scope is unknown. | |||
| """ | |||
| builder = OptionValueContainerBuilder() | |||
There was a problem hiding this comment.
This is all moved verbatim from parser.py.
benjyw
commented
Nov 15, 2024
| ) | ||
| explicitly_set = rank > Rank.HARDCODED | ||
|
|
||
| # If we explicitly set a deprecated but not-yet-expired option, warn about it. |
There was a problem hiding this comment.
The one change is that we used to check deprecations twice, once at registration time (but only to catch expired deprecations) and once at parse time. Now we do both in a single check, here, at parse time.
benjyw
commented
Nov 15, 2024
| with pytest.raises(CodeRemovedError): | ||
| create_options([GLOBAL_SCOPE], register, []) | ||
| opts.for_scope(scope=GLOBAL_SCOPE) |
There was a problem hiding this comment.
creating options doesn't now trigger the expired deprecation check, we must parse.
benjyw
commented
Nov 15, 2024
| @@ -95,7 +91,7 @@ def _invert(cls, s: bool | str | None) -> bool | None: | |||
| def __init__(self, scope: str) -> None: | |||
| """Create a Parser instance. | |||
|
|
|||
| :param scope_info: the scope this parser acts for. | |||
| :param scope: the scope this parser acts for. | |||
There was a problem hiding this comment.
This was a leftover docstring error
tdyas
approved these changes
Nov 16, 2024
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.
The Parser class had two jobs:
This change removes the final vestiges of the second, by
inlining them in
options.py.A future change will rename Parser to, say, Registrar, as
befits its now single remaining role.