aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-01-13 13:10:23 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-01-13 13:10:23 +0100
commite1e2f7464eb4e79328ba681fb2bf9b8ade741336 (patch)
tree34695f2ff441bb043a417f24086a7ccd204c4f20 /setup.py
parent46428412d6df33f449c254be4dccc8117d0c4a66 (diff)
parent9e2d050bb367fafafd08df48225864880527660f (diff)
downloadmitmproxy-e1e2f7464eb4e79328ba681fb2bf9b8ade741336.tar.gz
mitmproxy-e1e2f7464eb4e79328ba681fb2bf9b8ade741336.tar.bz2
mitmproxy-e1e2f7464eb4e79328ba681fb2bf9b8ade741336.zip
Merge pull request #112 from mitmproxy/update-cryptography
upgrade cryptography dependency for new wheels
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 0cc81a1b..2da10baa 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
deps = {
"pyasn1>=0.1.9, <0.2",
"pyOpenSSL>=0.15.1, <0.16",
- "cryptography>=1.1.1, <1.3",
+ "cryptography>=1.2.1, <1.3",
"passlib>=1.6.5, <1.7",
"hpack>=2.0.1, <2.1",
"six>=1.10.0, <1.11",