diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-06 15:59:24 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-06 15:59:24 -0700 |
| commit | f2f5beb75d60954c88922fc7f483c289cc5d4a7d (patch) | |
| tree | c269773538e8c663346191da69e824cbea06d5de /setup.py | |
| parent | 7cb7d9ad32c40cff9ceb0e28a5123960fed3638e (diff) | |
| parent | 2ee5e8ef0e632545038a72f0cedc0320c59b00ff (diff) | |
| download | mitmproxy-f2f5beb75d60954c88922fc7f483c289cc5d4a7d.tar.gz mitmproxy-f2f5beb75d60954c88922fc7f483c289cc5d4a7d.tar.bz2 mitmproxy-f2f5beb75d60954c88922fc7f483c289cc5d4a7d.zip | |
Merge branch 'pathod-lang-http'
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", |