Merge remote-tracking branch 'origin/master' into develop

lib/python/qmk/cli/__init__.py

@@ -180,8 +180,14 @@ def _broken_module_imports(requirements):
  print(f'Your MILC library is too old! Please upgrade: python3 -m pip install -U -r {str(requirements)}')
  exit(127)
 
+# Make sure we can run binaries in the same directory as our Python interpreter
+python_dir = os.path.dirname(sys.executable)
+
+if python_dir not in os.environ['PATH'].split(':'):
+ os.environ['PATH'] = ":".join((python_dir, os.environ['PATH']))
+
 # Check to make sure we have all our dependencies
-msg_install = 'Please run `python3 -m pip install -r %s` to install required python dependencies.'
+msg_install = f'Please run `{sys.executable} -m pip install -r %s` to install required python dependencies.'
 args = sys.argv[1:]
 while args and args[0][0] == '-':
  del args[0]