aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index a8301ec8..a114dafb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ install:
fi
- pip install tox
-script: set -o pipefail; python -m tox -- --cov netlib --cov mitmproxy --cov pathod 2>&1 | grep -v Cryptography_locking_cb
+script: tox -- --cov netlib --cov mitmproxy --cov pathod
after_success:
- |
diff --git a/setup.py b/setup.py
index 4c6ecb6e..b86a48c0 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ setup(
"certifi>=2015.11.20.1", # no semver here - this should always be on the last release!
"configargparse>=0.10, <0.11",
"construct>=2.5.2, <2.6",
- "cryptography>=1.3, <1.5",
+ "cryptography>=1.3, <1.6",
"cssutils>=1.0.1, <1.1",
"Flask>=0.10.1, <0.12",
"h2>=2.4.1, <3",