Align cformat rules with current CI implementation #7936
Merged
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
fauxpark
approved these changes
Jan 19, 2020
Erovia
reviewed
Jan 19, 2020
lib/python/qmk/cli/cformat.py
Outdated
| @@ -26,7 +26,8 @@ def cformat(cli): | |||
| else: | |||
| for dir in ['drivers', 'quantum', 'tests', 'tmk_core']: | |||
| for dirpath, dirnames, filenames in os.walk(dir): | |||
| if 'tmk_core/protocol/usb_hid' in dirpath: | |||
| ignores = ['tmk_core/protocol/usb_hid', 'quantum/template'] | |||
There was a problem hiding this comment.
Suggested change
| ignores = ['tmk_core/protocol/usb_hid', 'quantum/template'] |
I'd move this line out of the loops, right after else and would use Path objects:
ignores = [Path('tmk_core/protocol/usb_hid'), Path('quantum/template')]
There was a problem hiding this comment.
Moved.
Not sure I like the mixture of Path and strings, and would prefer to defer it to another round of #7872.
There was a problem hiding this comment.
Well, you can use os.path, something like if os.path.join(dirpath, dn) in ignores.
But it's just me thinking about the code, you original code worked enough, with 7b97f2d it works better, so I'm cool with it.
lib/python/qmk/cli/cformat.py
Outdated
Comment on lines
30
to
31
| if any(i in dirpath for i in ignores): | ||
| continue |
There was a problem hiding this comment.
Instead of skipping every dir/file individually, this will remove the ignorable(?) directory from the list and os.walk will not descend into it.
for dn in dirnames:
if Path(dirpath) / dn in ignores:
dirnames.remove(dn)
drashna
approved these changes
Jan 19, 2020
Erovia
approved these changes
Jan 20, 2020
noroadsleft
pushed a commit
to noroadsleft/qmk_firmware
that referenced
this pull request
Jan 24, 2020
* Align cformat rules with current CI implementation * Optimise file walking
drashna
pushed a commit
to zsa/qmk_firmware
that referenced
this pull request
Feb 12, 2020
* Align cformat rules with current CI implementation * Optimise file walking
fdidron
pushed a commit
to zsa/qmk_firmware
that referenced
this pull request
Feb 14, 2020
* Align cformat rules with current CI implementation * Optimise file walking
HokieGeek
pushed a commit
to HokieGeek/qmk_firmware
that referenced
this pull request
Feb 21, 2020
* Align cformat rules with current CI implementation * Optimise file walking
fdidron
pushed a commit
to zsa/qmk_firmware
that referenced
this pull request
Feb 26, 2020
* Align cformat rules with current CI implementation * Optimise file walking
c0psrul3
pushed a commit
to c0psrul3/qmk_firmware
that referenced
this pull request
Mar 23, 2020
* Align cformat rules with current CI implementation * Optimise file walking
kylekuj
pushed a commit
to kylekuj/qmk_firmware
that referenced
this pull request
Apr 21, 2020
* Align cformat rules with current CI implementation * Optimise file walking
BorisTestov
pushed a commit
to BorisTestov/qmk_firmware
that referenced
this pull request
May 23, 2024
* Align cformat rules with current CI implementation * Optimise file walking
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.
Description
Noticed while fixing #7934,
quantum/template/*gets included in clang-format, which breaks the tokens#define MANUFACTURER % YOUR_NAME %.Types of Changes
Checklist