tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply @skullydazed's suggestions, move 'import milc' 

Only 'import milc' after we are sure that the minimum required modules
are available, as it depends on a few of them.
master
Erovia 2020-03-23 17:08:35 +01:00 committed by skullydazed
parent 21799be1ca
commit eb683c8c52
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/qmk
View File

@ -13,9 +13,6 @@ qmk_dir = script_dir.parent
python_lib_dir = Path(qmk_dir / 'lib' / 'python').resolve() python_lib_dir = Path(qmk_dir / 'lib' / 'python').resolve()
sys.path.append(str(python_lib_dir)) sys.path.append(str(python_lib_dir))
# Setup the CLI
import milc # noqa
def _check_modules(requirements): def _check_modules(requirements):
""" Check if the modules in the given requirements.txt are available. """ Check if the modules in the given requirements.txt are available.
@ -39,11 +36,9 @@ def _check_modules(requirements):
if not find_spec(module['import']): if not find_spec(module['import']):
print('Could not find module %s!' % module['name']) print('Could not find module %s!' % module['name'])
print('Please run `python3 -m pip install -r %s` to install required python dependencies.' % str(qmk_dir / requirements))
if developer: if developer:
print('Please run `pip3 install -r requirements-dev.txt` to install the python development dependencies or turn off developer mode with `qmk config user.developer=None`.') print('You can also turn off developer mode: qmk config user.developer=None')
print()
else:
print('Please run `pip3 install -r requirements.txt` to install the python dependencies.')
print() print()
exit(255) exit(255)
@ -52,6 +47,9 @@ developer = False
# Make sure our modules have been setup # Make sure our modules have been setup
_check_modules('requirements.txt') _check_modules('requirements.txt')
# Setup the CLI
import milc # noqa
# For developers additional modules are needed # For developers additional modules are needed
if milc.cli.config.user.developer: if milc.cli.config.user.developer:
developer = True developer = True