New release: 0.0.17 → 0.0.18

milc.py

@@ -39,7 +39,7 @@ import colorama
 from appdirs import user_config_dir
 
 # Disable logging until we can configure it how the user wants
-logging.basicConfig(filename='/dev/null')
+logging.basicConfig(stream=os.devnull)
 
 # Log Level Representations
 EMOJI_LOGLEVELS = {
@@ -180,13 +180,13 @@ class ConfigurationSection(Configuration):
         self.parent = parent
 
     def __getitem__(self, key):
-        """Returns a config value, pulling from the `default` section as a fallback.
+        """Returns a config value, pulling from the `user` section as a fallback.
         """
         if key in self._config:
             return self._config[key]
 
-        elif key in self.parent.default:
-            return self.parent.default[key]
+        elif key in self.parent.user:
+            return self.parent.user[key]
 
         return None
 
@@ -429,11 +429,12 @@ class MILC(object):
                 self.arg_only.append(arg_name)
                 del kwargs['arg_only']
 
+            name = handler.__name__.replace("_", "-")
             if handler is self._entrypoint:
                 self.add_argument(*args, **kwargs)
 
-            elif handler.__name__ in self.subcommands:
-                self.subcommands[handler.__name__].add_argument(*args, **kwargs)
+            elif name in self.subcommands:
+                self.subcommands[name].add_argument(*args, **kwargs)
 
             else:
                 raise RuntimeError('Decorated function is not entrypoint or subcommand!')
@@ -599,7 +600,7 @@ class MILC(object):
             self.add_subparsers()
 
         if not name:
-            name = handler.__name__
+            name = handler.__name__.replace("_", "-")
 
         self.acquire_lock()
         kwargs['help'] = description

qmk_cli/__init__.py

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

qmk_cli/script_qmk.py

@@ -33,7 +33,7 @@ def in_qmk_firmware():
     while len(cur_dir.parents) > 0:
         found_bin = cur_dir / 'bin' / 'qmk'
         if found_bin.is_file():
-            command = [found_bin, '--version']
+            command = [found_bin.as_posix(), '--version']
             result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
             if result.returncode == 0:

qmk_cli/subcommands/setup.py

@@ -29,8 +29,8 @@ def setup(cli):
     else:
         cli.log.error('qmk_firmware not found!')
         if question('Would you like to clone %s?' % cli.args.fork):
-            git_url = '/'.join((cli.config.general.baseurl, cli.args.fork))
-            clone(git_url, cli.args.destination, cli.config.general.branch)
+            git_url = '/'.join((cli.config.setup.baseurl, cli.args.fork))
+            clone(git_url, cli.args.destination, cli.config.setup.branch)
 
     # Run `qmk_firmware/bin/qmk doctor` to check the rest of the environment out
     if qmk_firmware.exists():

release

@@ -1,5 +1,8 @@
 #!/bin/sh
 # Increment the verison number and release a new version of qmk_cli.
+#
+# Required packages: pip3 install bumpversion twine
+
 set -e
 set -x
 

setup.cfg

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

setup.py

@@ -6,6 +6,8 @@ setup_cfg.read('setup.cfg')
 metadata = setup_cfg['metadata']
 
 if __name__ == "__main__":
+    with open('README.md', encoding='utf-8') as readme_file:
+        long_description=readme_file.read()
     setup(
         name=metadata['dist-name'],
         description='A program to help users work with QMK Firmware.',
@@ -19,7 +21,7 @@ if __name__ == "__main__":
         author_email=metadata['author-email'],
         maintainer=metadata['author'],
         maintainer_email=metadata['author-email'],
-        long_description=open('README.md').read(),
+        long_description=long_description,
         long_description_content_type="text/markdown",
         packages=find_packages(),
         py_modules = ['milc'],
@@ -41,6 +43,7 @@ if __name__ == "__main__":
             #"milc", #FIXME(skullydazed): Included in the repo for now.
             "appdirs",
             "argcomplete",
-            "colorama"
+            "colorama",
+            "hjson"
         ],
     )