From 724f20ed32758b0c5d91ad4b7ba4a9348e152eeb Mon Sep 17 00:00:00 2001
From: Erovia <erovia@users.noreply.github.com>
Date: Thu, 20 Feb 2020 01:10:56 +0100
Subject: [PATCH] Use milc for config check, requirements fixes

Use milc's config finding and parsing to check if the user is a
developer or not.
'requirements-dev.txt' will now load 'requirements.txt', so no need to
run pip twice.
Add missing 'yapf' dependency to 'requirements-dev.txt'.
---
 bin/qmk              | 10 ++++------
 requirements-dev.txt |  4 ++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/qmk b/bin/qmk
index e4fb057ff22..b83f111e55d 100755
--- a/bin/qmk
+++ b/bin/qmk
@@ -13,8 +13,8 @@ qmk_dir = script_dir.parent
 python_lib_dir = Path(qmk_dir / 'lib' / 'python').resolve()
 sys.path.append(str(python_lib_dir))
 
-# QMK CLI user config file
-config_file = Path(Path.home() / '.config/qmk/qmk.ini')
+# Setup the CLI
+import milc  # noqa
 
 
 def _check_modules(requirements):
@@ -24,7 +24,7 @@ def _check_modules(requirements):
         for line in fd.readlines():
             line = line.strip().replace('<', '=').replace('>', '=')
 
-            if line[0] == '#':
+            if len(line) == 0 or line[0] == '#' or '-r' in line:
                 continue
 
             if '#' in line:
@@ -53,12 +53,10 @@ developer = False
 _check_modules('requirements.txt')
 
 # For developers additional modules are needed
-if config_file.exists() and 'developer = True' in config_file.read_text():
+if milc.cli.config.user.developer:
     developer = True
     _check_modules('requirements-dev.txt')
 
-# Setup the CLI
-import milc  # noqa
 
 milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}'
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index deab419cb21..1db3b6d7331 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,8 @@
+# Install the necessary requirements
+-r requirements.txt
+
 # Python development requirements
 nose2
 flake8
 pep8-naming
+yapf