New release: 0.0.22 → 0.0.23

milc.py

@@ -249,6 +249,9 @@ class MILC(object):
     """
     def __init__(self):
         """Initialize the MILC object.
+
+            version
+                The version string to associate with your CLI program
         """
         # Setup a lock for thread safety
         self._lock = threading.RLock() if thread else None
@@ -263,7 +266,7 @@ class MILC(object):
         self.config = None
         self.config_file = None
         self.default_arguments = {}
-        self.version = os.environ.get('QMK_VERSION', 'unknown')
+        self.version = 'unknown'
         self.release_lock()
 
         # Figure out our program name
@@ -364,6 +367,7 @@ class MILC(object):
         self.add_argument('--log-file', help='File to write log messages to')
         self.add_argument('--color', action='store_boolean', default=True, help='color in output')
         self.add_argument('--config-file', help='The location for the configuration file')
+        self.arg_only.append('config_file')
 
     def add_subparsers(self, title='Sub-commands', **kwargs):
         if self._inside_context_manager:
@@ -473,8 +477,10 @@ class MILC(object):
                     # Coerce values into useful datatypes
                     if value.lower() in ['1', 'yes', 'true', 'on']:
                         value = True
-                    elif value.lower() in ['0', 'no', 'false', 'none', 'off']:
+                    elif value.lower() in ['0', 'no', 'false', 'off']:
                         value = False
+                    elif value.lower() in ['none']:
+                        continue
                     elif value.replace('.', '').isdigit():
                         if '.' in value:
                             value = Decimal(value)
@@ -495,12 +501,12 @@ class MILC(object):
 
             if argument not in self.arg_only:
                 # Find the argument's section
-                argument_found = True
+                if argument in self.default_arguments[self._entrypoint.__name__]:
-                for group in self.default_arguments:
+                    argument_found = True
-                    if argument in self.default_arguments[group]:
+                    section = self._entrypoint.__name__
-                        argument_found = True
+                if argument in self.default_arguments['general']:
-                        section = group
+                    argument_found = True
-                        break
+                    section = 'general'
 
                 if not argument_found:
                     raise RuntimeError('Could not find argument in `self.default_arguments`. This should be impossible!')
@@ -536,7 +542,8 @@ class MILC(object):
                 if section_name == 'general':
                     if option_name in ['config_file']:
                         continue
-                config.set(section_name, option_name, str(value))
+                if value is not None:
+                    config.set(section_name, option_name, str(value))
 
         # Write out the config file
         config_dir = self.config_file.parent

qmk_cli/__init__.py

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

qmk_cli/script_qmk.py

@@ -56,7 +56,10 @@ def find_qmk_firmware():
         return Path(milc.cli.config.user.qmk_home).expanduser().resolve()
 
     if 'QMK_HOME' in os.environ:
-        return Path(os.environ['QMK_HOME']).expanduser().resolve()
+        path = Path(os.environ['QMK_HOME']).expanduser()
+        if path.exists():
+            return path.resolve()
+        return path
 
     return Path.home() / 'qmk_firmware'
 
@@ -65,6 +68,8 @@ def main():
     """Setup the environment before dispatching to the entrypoint.
     """
     # 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()

setup.cfg

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

setup.py

@@ -44,6 +44,7 @@ if __name__ == "__main__":
             "appdirs",
             "argcomplete",
             "colorama",
-            "hjson"
+            "hjson",
+            "yapf"
         ],
     )