alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/idf_pyserial_error' into 'master'

Browse Source 
idf.py: Import from pyserial after packages have been checked

See merge request idf/esp-idf!3519
This commit is contained in:
Angus Gratton 2018-10-26 12:58:03 +08:00
commit 76fcee55a6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/check_python_dependencies.py
View File

@ -68,7 +68,9 @@ if __name__ == "__main__":
print('The following Python requirements are not satisfied:')
for requirement in not_satisfied:
print(requirement)
print('Please run "{} -m pip install --user -r {}" for resolving the issue.'.format(sys.executable, args.requirements))
print('Please refer to the Get Started section of the ESP-IDF Programming Guide for setting up the required '
'packages. Alternatively, you can run "{} -m pip install --user -r {}" for resolving the issue.'
''.format(sys.executable, args.requirements))
sys.exit(1)
print('Python requirements from {} are satisfied.'.format(args.requirements))

6
tools/idf.py
View File

@ -22,7 +22,7 @@
# limitations under the License.
#
# Note: we don't check for Python build-time dependencies until
# WARNING: we don't check for Python build-time dependencies until
# check_environment() function below. If possible, avoid importing
# any external libraries here - put in external script, or import in
# their specific function instead.
@ -35,7 +35,6 @@ import multiprocessing
import re
import shutil
import json
import serial.tools.list_ports
class FatalError(RuntimeError):
"""
@ -419,6 +418,9 @@ def get_default_serial_port():
Same logic as esptool.py search order, reverse sort by name and choose the first port.
"""
# Import is done here in order to move it after the check_environment() ensured that pyserial has been installed
import serial.tools.list_ports
ports = list(reversed(sorted(
p.device for p in serial.tools.list_ports.comports() )))
try: