aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-02-07 21:57:41 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-02-07 21:57:41 +0100
commite2a084e7f733e5ac178af268b5d91ae92bb07e4f (patch)
tree928dffa62b24fb3c30e3d2a4f4aafa3ca31a775f
parent12d9594e85160ae2b445e6d7d33f762f2faf1d11 (diff)
parent04a5b4e540e02098d44539955a5d48f3fb0d1fda (diff)
downloadmitmproxy-e2a084e7f733e5ac178af268b5d91ae92bb07e4f.tar.gz
mitmproxy-e2a084e7f733e5ac178af268b5d91ae92bb07e4f.tar.bz2
mitmproxy-e2a084e7f733e5ac178af268b5d91ae92bb07e4f.zip
Merge pull request #37 from mitmproxy/requires-io-master
[requires.io] dependency update on master branch
-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': [