From 76854b77701f7de59a9ebe6cf2221e23c90d1e3d Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sun, 28 Aug 2016 15:54:41 +0200 Subject: [PATCH 1/2] cryptography 1.5 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4c6ecb6ef..b86a48c02 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", From cf53a93c4c9594042979d69571a3b9c88e125685 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sun, 28 Aug 2016 17:19:47 +0200 Subject: [PATCH 2/2] cleanup travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a8301ec82..a114dafb1 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: - |