Tidy up the last few Ruff problems in one_shot.py#160
Open
rswarbrick wants to merge 1 commit intolowRISC:masterfrom
Open
Tidy up the last few Ruff problems in one_shot.py#160rswarbrick wants to merge 1 commit intolowRISC:masterfrom
rswarbrick wants to merge 1 commit intolowRISC:masterfrom
Conversation
Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>
AlexJones0
reviewed
Apr 2, 2026
| """Simple one-shot build flow for non-simulation targets like linting, synthesis and FPV.""" | ||
|
|
||
| ignored_wildcards = [*FlowCfg.ignored_wildcards, "build_mode", "index", "test"] | ||
| ignored_wildcards: ClassVar[list[str]] = [ |
Contributor
There was a problem hiding this comment.
Aside (you don't need to change it in this PR, it just came to mind as I looked at the code):
It needs a more careful examination, but it looks to me like FlowCfg.ignored_wildcards is only used in its _expand stage (with the HJSON __dict__ replacement magic). That is, I think this class attribute is set once and never mutated (even by the HJSON). If that is the case then this should probably be converted to a ClassVar[tuple[str, ...]] to remove the mutability. Either way the ClassVar type is reasonable here.
|
|
||
| def __init__(self, flow_cfg_file, hjson_data, args, mk_config) -> None: | ||
| def __init__( | ||
| self, flow_cfg_file: str, hjson_data: Mapping, args: object, mk_config: Callable |
Contributor
There was a problem hiding this comment.
Nit: more specific types here?
Suggested change
| self, flow_cfg_file: str, hjson_data: Mapping, args: object, mk_config: Callable | |
| self, flow_cfg_file: str, hjson_data: Mapping[str, Any], args: argparse.Namespace, mk_config: Callable[[str], FlowCfg] |
| super().__init__(flow_cfg_file, hjson_data, args, mk_config) | ||
|
|
||
| def _merge_hjson(self, hjson_data) -> None: | ||
| def _merge_hjson(self, hjson_data: Mapping) -> None: |
Contributor
There was a problem hiding this comment.
Suggested change
| def _merge_hjson(self, hjson_data: Mapping) -> None: | |
| def _merge_hjson(self, hjson_data: Mapping[str, Any]) -> None: |
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
2 participants
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.
No description provided.