aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-10-16 22:22:12 -0700
committerGitHub <noreply@github.com>2016-10-16 22:22:12 -0700
commit209c73336c2c69366d9cfd1584ce8d62d32557d6 (patch)
tree6a299931ce98d49dede2e7266cc0c853ca406299
parent00071238d2e79ff91132b7e5a3bcc8019d9191ec (diff)
downloadmitmproxy-209c73336c2c69366d9cfd1584ce8d62d32557d6.tar.gz
mitmproxy-209c73336c2c69366d9cfd1584ce8d62d32557d6.tar.bz2
mitmproxy-209c73336c2c69366d9cfd1584ce8d62d32557d6.zip
update protobuf, reenable for py3 (#1618)
-rw-r--r--setup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index e7604fc0..0d4b7910 100644
--- a/setup.py
+++ b/setup.py
@@ -104,8 +104,8 @@ setup(
"sphinx_rtd_theme>=0.1.9, <0.2",
],
'contentviews': [
- # TODO: Find Python 3 replacements
- # "protobuf>=2.6.1, <2.7",
+ "protobuf>=3.1.0, <3.2",
+ # TODO: Find Python 3 replacement
# "pyamf>=0.8.0, <0.9",
],
'examples': [