aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-02-08 15:10:31 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-02-08 15:10:31 +0100
commit3c0685546fe59a4608e0289c106be1cfad9973b1 (patch)
tree3fddc1f20fda1522e78c2612239820dafeef89b1
parent14186d98d624492bb36e1d966a634994d0358bac (diff)
parente2a084e7f733e5ac178af268b5d91ae92bb07e4f (diff)
downloadmitmproxy-3c0685546fe59a4608e0289c106be1cfad9973b1.tar.gz
mitmproxy-3c0685546fe59a4608e0289c106be1cfad9973b1.tar.bz2
mitmproxy-3c0685546fe59a4608e0289c106be1cfad9973b1.zip
Merge branch 'master' of https://github.com/mitmproxy/pathod
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index a52f20b5..ff50bdd0 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ setup(
"netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION),
"requests>=2.9.1, <2.10",
"Flask>=0.10.1, <0.11",
- "pyparsing>=2.0.7, <2.1"
+ "pyparsing>=2.1,<2.2"
],
extras_require={
'dev': [