Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-11-23 00:24:00 +00:00
commit 69853175d0
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/python/qmk/cli/format/python.py
View file

@ -25,9 +25,8 @@ def yapf_run(files):
def filter_files(files): def filter_files(files):
"""Yield only files to be formatted and skip the rest """Yield only files to be formatted and skip the rest
""" """
for file in files: for file in files:
if file and file.name.split('.')[-1] in py_file_suffixes: if file and normpath(file).name.split('.')[-1] in py_file_suffixes:
yield file yield file
else: else:
cli.log.debug('Skipping file %s', file) cli.log.debug('Skipping file %s', file)
@ -53,12 +52,14 @@ def format_python(cli):
cli.log.warning('Filenames passed with -a, only formatting: %s', ','.join(map(str, files))) cli.log.warning('Filenames passed with -a, only formatting: %s', ','.join(map(str, files)))
elif cli.args.all_files: elif cli.args.all_files:
files = py_dirs git_ls_cmd = ['git', 'ls-files', *py_dirs]
git_ls = cli.run(git_ls_cmd, stdin=DEVNULL)
files = list(filter_files(git_ls.stdout.split('\n')))
else: else:
git_diff_cmd = ['git', 'diff', '--name-only', cli.args.base_branch, *py_dirs] git_diff_cmd = ['git', 'diff', '--name-only', cli.args.base_branch, *py_dirs]
git_diff = cli.run(git_diff_cmd, stdin=DEVNULL) git_diff = cli.run(git_diff_cmd, stdin=DEVNULL)
files = list(filter(None, git_diff.stdout.split('\n'))) files = list(filter_files(git_diff.stdout.split('\n')))
# Sanity check # Sanity check
if not files: if not files: