]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
format code according to conventions [skip ci]
authorQMK Bot <hello@qmk.fm>
Sat, 16 Nov 2019 07:10:19 +0000 (07:10 +0000)
committerQMK Bot <hello@qmk.fm>
Sat, 16 Nov 2019 07:10:19 +0000 (07:10 +0000)
lib/python/qmk/cli/compile.py
lib/python/qmk/cli/flash.py
lib/python/qmk/commands.py
lib/python/qmk/tests/test_cli_commands.py

index c7093d42156687b0731de0674f18f4df824840aa..5c29800096e61feed102b3db4db7755b9e94184e 100755 (executable)
@@ -38,13 +38,12 @@ def compile(cli):
         # Generate the keymap
         keymap_path = qmk.path.keymap(user_keymap['keyboard'])
         cli.log.info('Creating {fg_cyan}%s{style_reset_all} keymap in {fg_cyan}%s', user_keymap['keymap'], keymap_path)
-        
+
         # Compile the keymap
         command = compile_configurator_json(cli.args.filename)
 
         cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
 
-
     elif cli.config.compile.keyboard and cli.config.compile.keymap:
         # Generate the make command for a specific keyboard/keymap.
         command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap)
index 8f7bb55a22d548713bb3e0323a3ca6bed980bdf2..37556aaafd38dcceeb5bde94545bb615561e72a9 100644 (file)
@@ -32,6 +32,7 @@ def print_bootloader_help():
     cli.echo('\tst-link-cli')
     cli.echo('For more info, visit https://docs.qmk.fm/#/flashing')
 
+
 @cli.argument('-bl', '--bootloader', default='flash', help='The flash command, corresponding to qmk\'s make options of bootloaders.')
 @cli.argument('filename', nargs='?', arg_only=True, help='The configurator export JSON to compile. Use this if you dont want to specify a keymap and keyboard.')
 @cli.argument('-km', '--keymap', help='The keymap to build a firmware for. Use this if you dont have a configurator file. Ignored when a configurator file is supplied.')
@@ -84,4 +85,4 @@ def flash(cli):
         return False
 
     cli.log.info('Flashing keymap with {fg_cyan}%s\n\n', ' '.join(command))
-    subprocess.run(command)
\ No newline at end of file
+    subprocess.run(command)
index 9fbf00f165176c5e7e9f8a34614bc672bd314362..f83a89578e2735e6e3d6cc6c79b5cd3aa6818e38 100644 (file)
@@ -3,6 +3,7 @@
 import json
 import qmk.keymap
 
+
 def create_make_command(keyboard, keymap, target=None):
     """Create a make compile command
 
@@ -23,6 +24,7 @@ def create_make_command(keyboard, keymap, target=None):
         return ['make', ':'.join((keyboard, keymap))]
     return ['make', ':'.join((keyboard, keymap, target))]
 
+
 def parse_configurator_json(configurator_filename):
     """Open and parse a configurator json export
     """
@@ -31,6 +33,7 @@ def parse_configurator_json(configurator_filename):
     file.close()
     return user_keymap
 
+
 def compile_configurator_json(configurator_filename, bootloader=None):
     """Convert a configurator export JSON file into a C file
 
@@ -54,4 +57,3 @@ def compile_configurator_json(configurator_filename, bootloader=None):
     if bootloader is None:
         return create_make_command(user_keymap['keyboard'], user_keymap['keymap'])
     return create_make_command(user_keymap['keyboard'], user_keymap['keymap'], bootloader)
-
index dcab8bdae421f8c427c3185fe4d6fbc292a6d4de..3f75cef3e1d2b6b8644d08a47ae2fae3cb92be5f 100644 (file)
@@ -13,10 +13,12 @@ def test_cformat():
 def test_compile():
     assert check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default').returncode == 0
 
+
 def test_flash():
     assert check_subcommand('flash', '-b').returncode == 1
     assert check_subcommand('flash').returncode == 1
 
+
 def test_config():
     result = check_subcommand('config')
     assert result.returncode == 0