diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-29 02:04:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 02:04:38 -0700 |
| commit | 025efc030a66824f726e64a8b1c0c76aeef31fce (patch) | |
| tree | fb6459c64e6dacc0beb0308e9bcb8231c50e266c /setup.py | |
| parent | ac860c6fc018eb493d2b9a0bca79e7d6640625ff (diff) | |
| parent | b27c6ee18181d3300d5f47a3b0c1805b7e3d5c75 (diff) | |
| download | mitmproxy-025efc030a66824f726e64a8b1c0c76aeef31fce.tar.gz mitmproxy-025efc030a66824f726e64a8b1c0c76aeef31fce.tar.bz2 mitmproxy-025efc030a66824f726e64a8b1c0c76aeef31fce.zip | |
Merge pull request #1301 from mitmproxy/simplify-tox
Simplify tox
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -105,13 +105,14 @@ setup( "pytest-xdist>=1.14, <1.15", "sphinx>=1.3.5, <1.5", "sphinx-autobuild>=0.5.2, <0.7", - "sphinxcontrib-documentedlist>=0.3.0, <0.4", + "sphinxcontrib-documentedlist>=0.4.0, <0.5", "sphinx_rtd_theme>=0.1.9, <0.2", ], 'contentviews': [ "cssutils>=1.0.1, <1.1", - "protobuf>=2.6.1, <2.7", - "pyamf>=0.8.0, <0.9", + # TODO: Find Python 3 replacements + # "protobuf>=2.6.1, <2.7", + # "pyamf>=0.8.0, <0.9", ], 'examples': [ "beautifulsoup4>=4.4.1, <4.5", |