diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-09-03 11:08:53 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-03 11:08:53 +1200 |
| commit | b476966a45a6f77b1a819867dbbc943af9a57ef0 (patch) | |
| tree | 6a61ddaa7a218d262c03e3c5b28db6e66cf7cca8 | |
| parent | 46143ba004ee302c83d860225da5f32980b2af9b (diff) | |
| parent | cf53a93c4c9594042979d69571a3b9c88e125685 (diff) | |
| download | mitmproxy-b476966a45a6f77b1a819867dbbc943af9a57ef0.tar.gz mitmproxy-b476966a45a6f77b1a819867dbbc943af9a57ef0.tar.bz2 mitmproxy-b476966a45a6f77b1a819867dbbc943af9a57ef0.zip | |
Merge pull request #1513 from Kriechi/bump-dep
cryptography 1.5
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
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: - | @@ -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", |