From 39e5550dc0f41a6bfa9cb9f4d185debfdba0dc46 Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Tue, 1 Feb 2022 07:58:07 -0800 Subject: [PATCH 1/4] Reformat python due to yapf changes --- lib/python/qmk/cli/pytest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python/qmk/cli/pytest.py b/lib/python/qmk/cli/pytest.py index 2e4a0a9f007c..b7b17f0e9da4 100644 --- a/lib/python/qmk/cli/pytest.py +++ b/lib/python/qmk/cli/pytest.py @@ -12,7 +12,8 @@ def pytest(cli): """Run several linting/testing commands. """ - nose2 = cli.run(['nose2', '-v', '-t' 'lib/python', *cli.args.test], capture_output=False, stdin=DEVNULL) + nose2 = cli.run(['nose2', '-v', '-t' + 'lib/python', *cli.args.test], capture_output=False, stdin=DEVNULL) flake8 = cli.run(['flake8', 'lib/python'], capture_output=False, stdin=DEVNULL) return flake8.returncode | nose2.returncode From ace3f5dcd0fbed5a8558d5ca45f55073e545efdc Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Tue, 1 Feb 2022 08:13:01 -0800 Subject: [PATCH 2/4] Fix pytest keymap list test --- lib/python/qmk/tests/test_cli_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index 2973f817022e..9512447c2414 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py @@ -113,7 +113,7 @@ def test_list_keymaps_community(): def test_list_keymaps_kb_only(): - result = check_subcommand('list-keymaps', '-kb', 'niu_mini') + result = check_subcommand('list-keymaps', '-kb', 'kbdfans/niu_mini') check_returncode(result) assert 'default' and 'via' in result.stdout From a4ea724ea61571a53cf22c76713216e8b4f6921c Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Tue, 1 Feb 2022 08:20:33 -0800 Subject: [PATCH 3/4] revert formatting --- lib/python/qmk/cli/pytest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/python/qmk/cli/pytest.py b/lib/python/qmk/cli/pytest.py index b7b17f0e9da4..2e4a0a9f007c 100644 --- a/lib/python/qmk/cli/pytest.py +++ b/lib/python/qmk/cli/pytest.py @@ -12,8 +12,7 @@ def pytest(cli): """Run several linting/testing commands. """ - nose2 = cli.run(['nose2', '-v', '-t' - 'lib/python', *cli.args.test], capture_output=False, stdin=DEVNULL) + nose2 = cli.run(['nose2', '-v', '-t' 'lib/python', *cli.args.test], capture_output=False, stdin=DEVNULL) flake8 = cli.run(['flake8', 'lib/python'], capture_output=False, stdin=DEVNULL) return flake8.returncode | nose2.returncode From 767502a855f8f97fb92ae53c9d53f4f2c2d79a7a Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Tue, 1 Feb 2022 20:27:15 -0800 Subject: [PATCH 4/4] Use contra, because, well https://www.reddit.com/r/MechanicalKeyboards/comments/8riofq/did_i_kill_my_contra/ --- lib/python/qmk/tests/test_cli_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index 9512447c2414..54b143c64fe2 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py @@ -113,7 +113,7 @@ def test_list_keymaps_community(): def test_list_keymaps_kb_only(): - result = check_subcommand('list-keymaps', '-kb', 'kbdfans/niu_mini') + result = check_subcommand('list-keymaps', '-kb', 'contra') check_returncode(result) assert 'default' and 'via' in result.stdout