update_cluster_revisions.py: Add possibility to bump cluster revisions to the latest in spec #36456
+303
−24
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
|
Review changes with Changed Files
|
|
PR #36456: Size comparison from c3b35eb to 53d4c18 Full report (3 builds for cc32xx, stm32)
|
|
PR #36456: Size comparison from c3b35eb to ab056da Full report (68 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
andy31415
reviewed
Nov 12, 2024
andy31415
reviewed
Nov 12, 2024
soares-sergio
changed the title
Co-authored-by: Boris Zbarsky <[email protected]>
| @@ -126,6 +170,41 @@ def updateOne(item): | |||
| subprocess.check_call(['./scripts/tools/zap/convert.py', target]) | |||
|
|
|||
|
|
|||
| def updateOneToLatest(item): | |||
There was a problem hiding this comment.
Please follow pep8 satule (e.g. update_one_to_latest)
| json.dump(data, file) | ||
|
|
||
| # Now run convert.py on the file to have ZAP reformat it however it likes. | ||
| subprocess.check_call(['./scripts/tools/zap/convert.py', target]) |
There was a problem hiding this comment.
Please include python3 in the command
| @@ -51,6 +70,34 @@ def getTargets(cluster_id: int): | |||
| return targets | |||
|
|
|||
|
|
|||
| def get_outdated_clusters(data: object, xml_clusters: dict, args) -> list[ClusterInfo]: | |||
There was a problem hiding this comment.
The contents of args could have been state of a VersionUpdateProcessor class.
Overall this script relies too much on passing data around that could be state of a class
| def get_outdated_clusters(data: object, xml_clusters: dict, args) -> list[ClusterInfo]: | ||
| result = [] | ||
| for endpoint in data.get("endpointTypes", []): | ||
| endpoint_id = endpoint.get("id") - 1 |
There was a problem hiding this comment.
That is NOT the endpoint_id. Endpoint IDs are separate from the id field. This may work oddly on ZAP files that have non-contiguous endpoint IDs.
| except (KeyError, ValueError): | ||
| continue | ||
| # Filter in outdated clusters only | ||
| if (cluster_revision == spec_revision): |
There was a problem hiding this comment.
avoid C-style () around whole condition
| if (cluster_revision == spec_revision): | ||
| break | ||
| # If old_revision is present, filter in matching only | ||
| if (args.old_revision is not None and cluster_revision != args.old_revision): |
There was a problem hiding this comment.
Parenthesize sub-expressions:
Suggested change
| if (args.old_revision is not None and cluster_revision != args.old_revision): | |
| if (args.old_revision is not None) and (cluster_revision != args.old_revision): |
tehampson
approved these changes
Dec 16, 2024
| cluster_code: int | ||
| cluster_spec_revision: int | ||
| cluster_name: str | ||
| json_attribute: object |
There was a problem hiding this comment.
nit, for hinting isn't this a dict[str,object]?
| @@ -51,6 +70,34 @@ def getTargets(cluster_id: int): | |||
| return targets | |||
|
|
|||
|
|
|||
| def get_outdated_clusters(data: object, xml_clusters: dict, args) -> list[ClusterInfo]: | |||
There was a problem hiding this comment.
nit, there is a mix of functions in this PR mixed with with snake_case and lowerCamelCase. Overall I think autopep8 does say we should to functions are snake_case. My suggestions is keep it the same for the file and if we want to migrate the entire file we do it all at once in the file as a follow up refactor
There was a problem hiding this comment.
Or follow Tennessee's recommendation of starting the switch to pep8 and doing that for all your newly introduced functions
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 PR adds a new feature to the
update_cluster_revisions.pytool:--new-revisionargument is omitted.If
--new-revisionis provided, the tool uses it and behaves as previously implemented.I've also added documentation in
README.mdon how to use the tool and expected output examples.