summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2016-01-31 14:18:54 +0100
committerHynek Schlawack <hs@ox.cx>2016-01-31 15:12:01 +0100
commit2a91ba31326eb0ad2e36b9aaa33c826899197ad2 (patch)
tree63ef357bc4e7d9dcb3c21daeba3fea3dccf1bc29 /tox.ini
parent85bc15c101a23f5dd0b85b2a6cacabc614b6b3cf (diff)
downloadpyopenssl-git-2a91ba31326eb0ad2e36b9aaa33c826899197ad2.tar.gz
Make pyOpenSSL future-proof
Notably stop breaking cryptography 1.3.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini5
1 files changed, 3 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 73f6018..44ee420 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptographyLegacy},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
[testenv]
whitelist_externals =
@@ -7,8 +7,9 @@ whitelist_externals =
passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH TERM
deps =
coverage
- pytest>=2.8.2,!=2.8.4
+ pytest>=2.8.5
cryptographyMaster: git+https://github.com/pyca/cryptography.git
+ cryptographyLegacy: cryptography<1.2
setenv =
# Do not allow the executing environment to pollute the test environment
# with extra packages.