diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
| commit | 75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34 (patch) | |
| tree | 9bff77b84d485549f2d9cfad61a4c54b6315088d /setup.py | |
| parent | e037fe05ff1f0c2893b3f51e06e0261ca4245d63 (diff) | |
| parent | 80292c0ac3c9684ee945546c9b45334178518e4e (diff) | |
| download | mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.gz mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.bz2 mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -75,7 +75,7 @@ setup( "passlib>=1.6.5, <1.7", "pyasn1>=0.1.9, <0.2", "pyOpenSSL>=16.0, <17.0", - "pyparsing>=2.0, <2.1", # 2.1.1 breaks our binaries, see https://sourceforge.net/p/pyparsing/bugs/93/ + "pyparsing>=2.1.3, <2.2", "pyperclip>=1.5.22, <1.6", "requests>=2.9.1, <2.10", "six>=1.10, <1.11", |