Skip to content

Commit

Permalink
Apply @skullydazed's suggestions, move 'import milc'
Browse files Browse the repository at this point in the history
Only 'import milc' after we are sure that the minimum required modules
are available, as it depends on a few of them.
  • Loading branch information
Erovia authored and skullydazed committed Apr 8, 2020
1 parent 21799be commit eb683c8
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions bin/qmk
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ qmk_dir = script_dir.parent
python_lib_dir = Path(qmk_dir / 'lib' / 'python').resolve()
sys.path.append(str(python_lib_dir))

# Setup the CLI
import milc # noqa


def _check_modules(requirements):
""" Check if the modules in the given requirements.txt are available.
Expand All @@ -39,19 +36,20 @@ def _check_modules(requirements):

if not find_spec(module['import']):
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:
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()
else:
print('Please run `pip3 install -r requirements.txt` to install the python dependencies.')
print()
exit(255)
print('You can also turn off developer mode: qmk config user.developer=None')
print()
exit(255)


developer = False
# Make sure our modules have been setup
_check_modules('requirements.txt')

# Setup the CLI
import milc # noqa

# For developers additional modules are needed
if milc.cli.config.user.developer:
developer = True
Expand Down

0 comments on commit eb683c8

Please sign in to comment.