aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-02-10 15:28:10 +0100
committerGitHub <noreply@github.com>2017-02-10 15:28:10 +0100
commitd70f7cd8cc6343bb520f07eaaad86d0645e2800c (patch)
tree2f1fc2bf55f5fe14e69e3c689e6d558ab647d254
parent43867dbd987a36ba6a517508503da482eeeca9ea (diff)
parent1c8836a8d633fa11d87a5583e370e67f8603bc25 (diff)
downloadmitmproxy-d70f7cd8cc6343bb520f07eaaad86d0645e2800c.tar.gz
mitmproxy-d70f7cd8cc6343bb520f07eaaad86d0645e2800c.tar.bz2
mitmproxy-d70f7cd8cc6343bb520f07eaaad86d0645e2800c.zip
Merge pull request #2004 from mhils/update-dependencies
update dependencies
-rw-r--r--setup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 406f9e6a..4a3999ac 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ setup(
"kaitaistruct>=0.5, <0.6",
"Pillow>=3.2, <4.1",
"passlib>=1.6.5, <1.8",
- "pyasn1>=0.1.9, <0.2",
+ "pyasn1>=0.1.9, <0.3",
"pyOpenSSL>=16.0, <17.0",
"pyparsing>=2.1.3, <2.2",
"pyperclip>=1.5.22, <1.6",
@@ -97,7 +97,7 @@ setup(
],
'dev': [
"Flask>=0.10.1, <0.13",
- "flake8>=3.2.1, <3.3",
+ "flake8>=3.2.1, <3.4",
"mypy-lang>=0.4.6, <0.5",
"rstcheck>=2.2, <4.0",
"tox>=2.3, <3",
@@ -112,7 +112,7 @@ setup(
"sphinx_rtd_theme>=0.1.9, <0.2",
],
'contentviews': [
- "protobuf>=3.1.0, <3.2",
+ "protobuf>=3.1.0, <3.3",
# TODO: Find Python 3 replacement
# "pyamf>=0.8.0, <0.9",
],