aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-08-26 21:48:24 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2016-08-26 09:48:24 -0400
commit07ea3cd3ea23608ad5dfea008674d89e03cb1d33 (patch)
tree244ccf4ac6c001fad0e7036ce01615c92b7f643a /.travis.yml
parent9736716017aac1d9da14b858903b20bb65b426e6 (diff)
downloadcryptography-07ea3cd3ea23608ad5dfea008674d89e03cb1d33.tar.gz
cryptography-07ea3cd3ea23608ad5dfea008674d89e03cb1d33.tar.bz2
cryptography-07ea3cd3ea23608ad5dfea008674d89e03cb1d33.zip
OpenSSL 1.1.0 support (#2826)
* make pre5 work * add a blank line to make the diff happier * 1.1.0-pre6 working * support the changes since 1.1.0-pre6 * fixes * add 1.1.0 to travis * expose the symbol * better testing for numericstring * handle libre... * actually use the 1.1.0 we compile * cache the ossl-110 dir on travis * add some newlines * changelog entry for 1.1.0 support * note that we test on 1.1.0 * proper skip on this test * reorder
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 74e8b264..1b33c6f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ cache:
directories:
- $HOME/.cache/pip
- $HOME/ossl-100t
+ - $HOME/ossl-110
matrix:
include:
@@ -30,6 +31,10 @@ matrix:
- python: 3.5
env: TOXENV=py35 OPENSSL=1.0.0
- python: 2.7
+ env: TOXENV=py27 OPENSSL=1.1.0
+ - python: 3.5
+ env: TOXENV=py35 OPENSSL=1.1.0
+ - python: 2.7
env: TOXENV=docs
addons:
apt: