New release: 0.0.12 → 0.0.13

qmk_cli/__init__.py

@@ -1,3 +1,3 @@
 """A program to help you work with qmk_firmware."""
 
-__version__ = '0.0.11'
+__version__ = '0.0.13'

qmk_cli/script_qmk.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 """CLI wrapper for running QMK commands.
 
-This program can be run from anywhere, with or without a qmk_firmware checkout. It provides a small set of subcommands for working with QMK and otherwise dispatches to the `qmk_firmware/bin/qmk` script for the repo you are currently in, or your default repo if you are not currently in a qmk_firmware checkout.
+This program can be run from anywhere, with or without a qmk_firmware repository. If a qmk_firmware repository can be located we will use that to augment our available subcommands.
 
 FIXME(skullydazed/anyone): --help shows underscores where we want dashes in subcommands (EG json_keymap instead of json-keymap)
-TODO(skullydazed/anyone): Need a way to filter some subcommands from --help (EG `qmk subcommands`)
+TODO(skullydazed/anyone): Need a way to filter some subcommands from --help (EG `qmk hello`)
 """
 import argparse
 import os
@@ -61,20 +61,18 @@ def find_qmk_firmware():
 
 
 def main():
-    """Dispatch the CLI subcommand to the proper place.
+    """Setup the environment before dispatching to the entrypoint.
-
-    We first check to see if the subcommand was provided by the global `qmk`. If it was we import that module and hand control over to the entrypoint.
-
-    All other subcommands are dispatched to the local `qmk`, either the one we are currently in or whatever the user's default qmk_firmware is.
     """
     # Environment setup
     qmk_firmware = find_qmk_firmware()
     os.environ['QMK_HOME'] = str(qmk_firmware)
+    os.environ['ORIG_CWD'] = os.getcwd()
 
     # Import the subcommand modules
     import qmk_cli.subcommands
 
     if qmk_firmware.exists():
+        os.chdir(str(qmk_firmware))
         sys.path.append(str(qmk_firmware / 'lib' / 'python'))
         import qmk.cli
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.11
+current_version = 0.0.13
 commit = True
 tag = True
 tag_name = {new_version}

setup.py

@@ -22,6 +22,7 @@ if __name__ == "__main__":
         long_description=open('README.md').read(),
         long_description_content_type="text/markdown",
         packages=find_packages(),
+        py_modules = ['milc'],
         classifiers=[
             'Development Status :: 3 - Alpha',
             'Environment :: Console',