diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/qmk/cli/doctor/check.py | 1 | ||||
| -rwxr-xr-x | lib/python/qmk/cli/format/python.py | 6 | ||||
| -rw-r--r-- | lib/python/qmk/cli/pytest.py | 2 | ||||
| -rw-r--r-- | lib/python/qmk/commands.py | 2 | ||||
| -rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 2 | 
5 files changed, 6 insertions, 7 deletions
| diff --git a/lib/python/qmk/cli/doctor/check.py b/lib/python/qmk/cli/doctor/check.py index 0807f41518..2d691b64b0 100644 --- a/lib/python/qmk/cli/doctor/check.py +++ b/lib/python/qmk/cli/doctor/check.py @@ -26,7 +26,6 @@ ESSENTIAL_BINARIES = {      'arm-none-eabi-gcc': {          'version_arg': '-dumpversion'      }, -    'bin/qmk': {},  } diff --git a/lib/python/qmk/cli/format/python.py b/lib/python/qmk/cli/format/python.py index 00612f97ec..b32a726401 100755 --- a/lib/python/qmk/cli/format/python.py +++ b/lib/python/qmk/cli/format/python.py @@ -11,15 +11,15 @@ def format_python(cli):      """Format python code according to QMK's style.      """      edit = '--diff' if cli.args.dry_run else '--in-place' -    yapf_cmd = ['yapf', '-vv', '--recursive', edit, 'bin/qmk', 'lib/python'] +    yapf_cmd = ['yapf', '-vv', '--recursive', edit, 'lib/python']      try:          cli.run(yapf_cmd, check=True, capture_output=False, stdin=DEVNULL) -        cli.log.info('Python code in `bin/qmk` and `lib/python` is correctly formatted.') +        cli.log.info('Python code in `lib/python` is correctly formatted.')          return True      except CalledProcessError:          if cli.args.dry_run: -            cli.log.error('Python code in `bin/qmk` and `lib/python` incorrectly formatted!') +            cli.log.error('Python code in `lib/python` is incorrectly formatted!')          else:              cli.log.error('Error formatting python code!') diff --git a/lib/python/qmk/cli/pytest.py b/lib/python/qmk/cli/pytest.py index bdb336b9a7..a7f01a872a 100644 --- a/lib/python/qmk/cli/pytest.py +++ b/lib/python/qmk/cli/pytest.py @@ -12,6 +12,6 @@ def pytest(cli):      """Run several linting/testing commands.      """      nose2 = cli.run(['nose2', '-v'], capture_output=False, stdin=DEVNULL) -    flake8 = cli.run(['flake8', 'lib/python', 'bin/qmk'], capture_output=False, stdin=DEVNULL) +    flake8 = cli.run(['flake8', 'lib/python'], capture_output=False, stdin=DEVNULL)      return flake8.returncode | nose2.returncode diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index 421453d837..01c23b2612 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py @@ -233,7 +233,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va          f'VERBOSE={verbose}',          f'COLOR={color}',          'SILENT=false', -        f'QMK_BIN={"bin/qmk" if "DEPRECATED_BIN_QMK" in os.environ else "qmk"}', +        'QMK_BIN="qmk"',      ])      return make_command diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index b39fe5e46d..e4eaef899a 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py @@ -83,7 +83,7 @@ def test_hello():  def test_format_python():      result = check_subcommand('format-python', '--dry-run')      check_returncode(result) -    assert 'Python code in `bin/qmk` and `lib/python` is correctly formatted.' in result.stdout +    assert 'Python code in `lib/python` is correctly formatted.' in result.stdout  def test_list_keyboards(): | 
