From 558251860ac8c678110853fb60628d0bfdc12f74 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 May 2021 03:07:13 +1000 Subject: [PATCH] Updates for milc 1.4.0 (#52) * Updates for milc 1.4.0 * Add halo dependency * Just set version for now; remove halo as milc 1.4.1 should pull that in * Bump milc * Remove appdirs, argcomplete and colorama as they are also pulled in by MILC --- qmk_cli/script_qmk.py | 4 ++-- qmk_cli/subcommands/setup.py | 2 +- setup.py | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/qmk_cli/script_qmk.py b/qmk_cli/script_qmk.py index 836f991..e81a8f9 100644 --- a/qmk_cli/script_qmk.py +++ b/qmk_cli/script_qmk.py @@ -14,8 +14,10 @@ import milc import milc.subcommand.config # noqa from milc.questions import yesno +from . import __version__ from .helpers import find_qmk_firmware, is_qmk_firmware +milc.set_metadata(version=__version__) milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}' @@ -56,8 +58,6 @@ def main(): exit(1) # Environment setup - import qmk_cli - milc.cli.version = qmk_cli.__version__ qmk_firmware = find_qmk_firmware() os.environ['QMK_HOME'] = str(qmk_firmware) os.environ['ORIG_CWD'] = os.getcwd() diff --git a/qmk_cli/subcommands/setup.py b/qmk_cli/subcommands/setup.py index 9a006c6..32463c6 100644 --- a/qmk_cli/subcommands/setup.py +++ b/qmk_cli/subcommands/setup.py @@ -93,7 +93,7 @@ def setup(cli): # Run `qmk doctor` to check the rest of the environment out color = '--color' if cli.config.general.color else '--no-color' unicode = '--unicode' if cli.config.general.unicode else '--no-unicode' - doctor_command = [sys.argv[0], color, unicode, 'doctor'] + doctor_command = [Path(sys.argv[0]).as_posix(), color, unicode, 'doctor'] if cli.args.no: doctor_command.append('--no') diff --git a/setup.py b/setup.py index e4b9960..82c398a 100644 --- a/setup.py +++ b/setup.py @@ -40,15 +40,12 @@ if __name__ == "__main__": ], python_requires=metadata['requires-python'], install_requires=[ - "appdirs", - "argcomplete", - "colorama", "dotty-dict", "flake8", "hid", "hjson", "jsonschema>=3", - "milc>=1.3.0", + "milc>=1.4.0", "nose2", "pygments", "pyusb",