summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2016-03-16 13:37:05 +0100
committerHynek Schlawack <hs@ox.cx>2016-03-16 13:43:26 +0100
commit73412e5bb381a9d4ac303d5bc8898786a4e3eb25 (patch)
tree0913661e26fe15aa476177d92f5e9f1c132de1e5 /tox.ini
parentb1f3ca86c0bb78a524bb9c677427bb8f1dd35323 (diff)
downloadpyopenssl-73412e5bb381a9d4ac303d5bc8898786a4e3eb25.tar.gz
Fix cryptography minimum version
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 374d568..905747f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptography1.2},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptographyMinimum},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
[testenv]
whitelist_externals =
@@ -9,7 +9,7 @@ deps =
coverage
pytest>=2.8.5
cryptographyMaster: git+https://github.com/pyca/cryptography.git
- cryptography1.2: cryptography<1.3
+ cryptographyMinimum: cryptography<1.4
setenv =
# Do not allow the executing environment to pollute the test environment
# with extra packages.