summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-03-16 07:51:00 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2016-03-16 07:51:00 -0400
commit97b367e3cfa93bba7e5db3a92a7a5169e64342d3 (patch)
tree39cd5a1506fe4cb64ad831eeb083fb5bc7e2f760 /tox.ini
parentc84567b2b40d3fdb49776470b18b9cdf144aa6f3 (diff)
downloadpyopenssl-97b367e3cfa93bba7e5db3a92a7a5169e64342d3.tar.gz
Update these jobs
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 a1b7138..374d568 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptography1.1},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptography1.2},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.1: cryptography<1.2
+ cryptography1.2: cryptography<1.3
setenv =
# Do not allow the executing environment to pollute the test environment
# with extra packages.