Merge branch 'bugfix/pyparsing' into 'master'

Temporarily fix incompatibility with pyparsing 2.4.0 See merge request idf/esp-idf!4809
2019-04-23 10:35:50 +08:00 · 2019-04-23 10:35:50 +08:00 · 8513b8ead4
parent 1718a93119 08adc39102
commit 8513b8ead4
1 changed files with 1 additions and 1 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -8,5 +8,5 @@ setuptools
 pyserial>=3.0
 future>=0.15.2
 cryptography>=2.1.4
-pyparsing>=2.0.3
+pyparsing>=2.0.3,<2.4.0
 pyelftools>=0.22