aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-06 13:29:39 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-06 13:29:39 -0700
commitc973fd881fc4cabb401fdb255b2486b80499442c (patch)
tree2ff05d858e3b91bd001156abe0ebe9d5832736dd
parentafa2ad81df2478b6c6b2819ee2c0460128aeff4a (diff)
downloadmitmproxy-c973fd881fc4cabb401fdb255b2486b80499442c.tar.gz
mitmproxy-c973fd881fc4cabb401fdb255b2486b80499442c.tar.bz2
mitmproxy-c973fd881fc4cabb401fdb255b2486b80499442c.zip
update pyparsing
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 2e7f0a0b..dd34465c 100644
--- a/setup.py
+++ b/setup.py
@@ -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",