aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-01-07 22:38:19 +0100
committerMaximilian Hils <git@maximilianhils.com>2017-01-07 23:07:50 +0100
commit1e89a938016a8ec446c9c15885bfa3c570b9978d (patch)
tree802154be6792635432518715001673fb6b86a3ad /setup.py
parent3ea76a7f3e123a9ad8f05a6f0325e6642c6aa01a (diff)
downloadmitmproxy-1e89a938016a8ec446c9c15885bfa3c570b9978d.tar.gz
mitmproxy-1e89a938016a8ec446c9c15885bfa3c570b9978d.tar.bz2
mitmproxy-1e89a938016a8ec446c9c15885bfa3c570b9978d.zip
update dependencies
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/setup.py b/setup.py
index fa20e7cf..2fb55941 100644
--- a/setup.py
+++ b/setup.py
@@ -67,12 +67,11 @@ setup(
"construct>=2.8, <2.9",
"cryptography>=1.3, <1.8",
"cssutils>=1.0.1, <1.1",
- "Flask>=0.10.1, <0.12",
"h2>=2.5.1, <3",
"html2text>=2016.1.8, <=2016.9.19",
"hyperframe>=4.0.1, <5",
"jsbeautifier>=1.6.3, <1.7",
- "Pillow>=3.2, <3.5",
+ "Pillow>=3.2, <4.1",
"passlib>=1.6.5, <1.8",
"pyasn1>=0.1.9, <0.2",
"pyOpenSSL>=16.0, <17.0",
@@ -96,9 +95,10 @@ setup(
':sys_platform != "win32"': [
],
'dev': [
+ "Flask>=0.10.1, <0.13",
"flake8>=3.2.1, <3.3",
"mypy-lang>=0.4.6, <0.5",
- "rstcheck>=2.2, <3.0",
+ "rstcheck>=2.2, <4.0",
"tox>=2.3, <3",
"mock>=2.0, <2.1",
"pytest>=3, <3.1",
@@ -108,8 +108,7 @@ setup(
"pytest-faulthandler>=1.3.0, <2",
"sphinx>=1.3.5, <1.6",
"sphinx-autobuild>=0.5.2, <0.7",
- "sphinxcontrib-documentedlist>=0.4.0, <0.5",
- "docutils==0.12", # temporary pin, https://github.com/chintal/sphinxcontrib-documentedlist/pull/3
+ "sphinxcontrib-documentedlist>=0.5.0, <0.6",
"sphinx_rtd_theme>=0.1.9, <0.2",
],
'contentviews': [