diff options
| author | Zach White <skullydazed@gmail.com> | 2021-05-19 15:24:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 15:24:46 -0700 |
| commit | db1eacdaacb9c8f6889f46bc1c6af155b81ad72a (patch) | |
| tree | cd32a69a04c7ff93a11941d82aef3ce31c2b7523 /lib/python/qmk/cli/pyformat.py | |
| parent | a9aec546c873fa5a2cb1d9a10878aca71818b609 (diff) | |
| download | qmk_firmware-db1eacdaacb9c8f6889f46bc1c6af155b81ad72a.tar.gz qmk_firmware-db1eacdaacb9c8f6889f46bc1c6af155b81ad72a.zip | |
Align our subprocess usage with current best practices. (#12940)
* Align our subprocess usage with current best practices.
* remove unused import
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* fix the cpp invocation for older python
* allow for unprompted installation
* make sure qmk new-keyboard works on windows
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'lib/python/qmk/cli/pyformat.py')
| -rwxr-xr-x | lib/python/qmk/cli/pyformat.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/pyformat.py b/lib/python/qmk/cli/pyformat.py index 02581f0d8..abe5f6de1 100755 --- a/lib/python/qmk/cli/pyformat.py +++ b/lib/python/qmk/cli/pyformat.py | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | """Format python code according to QMK's style. | 1 | """Format python code according to QMK's style. |
| 2 | """ | 2 | """ |
| 3 | from milc import cli | 3 | from subprocess import CalledProcessError, DEVNULL |
| 4 | 4 | ||
| 5 | import subprocess | 5 | from milc import cli |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | @cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Flag only, don't automatically format.") | 8 | @cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Flag only, don't automatically format.") |
| @@ -13,11 +13,11 @@ def pyformat(cli): | |||
| 13 | edit = '--diff' if cli.args.dry_run else '--in-place' | 13 | edit = '--diff' if cli.args.dry_run else '--in-place' |
| 14 | yapf_cmd = ['yapf', '-vv', '--recursive', edit, 'bin/qmk', 'lib/python'] | 14 | yapf_cmd = ['yapf', '-vv', '--recursive', edit, 'bin/qmk', 'lib/python'] |
| 15 | try: | 15 | try: |
| 16 | cli.run(yapf_cmd, check=True, capture_output=False) | 16 | cli.run(yapf_cmd, check=True, capture_output=False, stdin=DEVNULL) |
| 17 | cli.log.info('Python code in `bin/qmk` and `lib/python` is correctly formatted.') | 17 | cli.log.info('Python code in `bin/qmk` and `lib/python` is correctly formatted.') |
| 18 | return True | 18 | return True |
| 19 | 19 | ||
| 20 | except subprocess.CalledProcessError: | 20 | except CalledProcessError: |
| 21 | if cli.args.dry_run: | 21 | if cli.args.dry_run: |
| 22 | cli.log.error('Python code in `bin/qmk` and `lib/python` incorrectly formatted!') | 22 | cli.log.error('Python code in `bin/qmk` and `lib/python` incorrectly formatted!') |
| 23 | else: | 23 | else: |
