aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-29 03:30:49 -0700
committerGitHub <noreply@github.com>2016-06-29 03:30:49 -0700
commit98dc9d3d7ee60f54aa3105d758e2da51e7f95644 (patch)
treef444dc8c4e9779817322d7bbab992d04fd3081af /setup.py
parent025efc030a66824f726e64a8b1c0c76aeef31fce (diff)
parent8366c87c57f8f81645d7021407e0229a81e06136 (diff)
downloadmitmproxy-98dc9d3d7ee60f54aa3105d758e2da51e7f95644.tar.gz
mitmproxy-98dc9d3d7ee60f54aa3105d758e2da51e7f95644.tar.bz2
mitmproxy-98dc9d3d7ee60f54aa3105d758e2da51e7f95644.zip
Merge pull request #1302 from mhils/update-dependencies
Update Dependencies
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/setup.py b/setup.py
index 991efa15..564eb4d7 100644
--- a/setup.py
+++ b/setup.py
@@ -65,22 +65,21 @@ setup(
"configargparse>=0.10, <0.11",
"construct>=2.5.2, <2.6",
"cryptography>=1.3, <1.5",
- "Flask>=0.10.1, <0.11",
+ "Flask>=0.10.1, <0.12",
"h2>=2.3.1, <3",
- "html2text>=2016.1.8, <=2016.4.2",
+ "html2text>=2016.1.8, <=2016.5.29",
"hyperframe>=4.0.1, <5",
"lxml>=3.5.0, <3.7",
"Pillow>=3.2, <3.3",
"passlib>=1.6.5, <1.7",
- "psutil>=4.2.0, <4.3",
+ "psutil>=4.2, <4.4",
"pyasn1>=0.1.9, <0.2",
"pyOpenSSL>=16.0, <17.0",
"pyparsing>=2.1.3, <2.2",
"pyperclip>=1.5.22, <1.6",
- "requests>=2.9.1, <2.10",
+ "requests>=2.9.1, <2.11",
"six>=1.10, <1.11",
"tornado>=4.3, <4.4",
- "typing==3.5.1.0",
"urwid>=1.3.1, <1.4",
"watchdog>=0.8.3, <0.9",
],
@@ -95,6 +94,7 @@ setup(
':python_version == "2.7"': [
"enum34>=1.0.4, <2",
"ipaddress>=1.0.15, <1.1",
+ "typing==3.5.2.2",
],
'dev': [
"tox>=2.3, <3",
@@ -117,7 +117,7 @@ setup(
'examples': [
"beautifulsoup4>=4.4.1, <4.5",
"harparser>=0.2, <0.3",
- "pytz>=2015.07.0, <=2016.3",
+ "pytz>=2015.07.0, <=2016.4",
]
}
)