diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-03 12:36:40 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-03 16:17:37 -0600 |
| commit | 9dba330579eb5ff14447d01759ef7c6b71d1c556 (patch) | |
| tree | 7a5f80b5fc2c334a2527e7de1d6f6e91a29a0918 | |
| parent | 743a213d33ad8b1a2ef0becd0084c3fceebac8dd (diff) | |
| download | cryptography-9dba330579eb5ff14447d01759ef7c6b71d1c556.tar.gz cryptography-9dba330579eb5ff14447d01759ef7c6b71d1c556.tar.bz2 cryptography-9dba330579eb5ff14447d01759ef7c6b71d1c556.zip | |
run a 1.0.0 test in travis as well
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | .travis/install.sh | 3 | ||||
| -rwxr-xr-x | .travis/run.sh | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index e99d8908..a510b944 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ cache: directories: - $HOME/.cache/pip - $HOME/ossl-098l + - $HOME/ossl-100t matrix: include: @@ -21,6 +22,8 @@ matrix: env: TOXENV=py35 - python: pypy env: TOXENV=pypy + - python: 3.5 + env: TOXENV=py35 OPENSSL=1.0.0 - python: 2.6 env: TOXENV=py26 OPENSSL=0.9.8 - python: 2.7 diff --git a/.travis/install.sh b/.travis/install.sh index 5e8c11cc..499233d7 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -67,6 +67,9 @@ else # patches, but while that's in jenkins we don't get coverage data from it). OPENSSL_VERSION_NUMBER="0.9.8l" OPENSSL_DIR="ossl-098l" + elif [[ "${OPENSSL}" == "1.0.0" ]]; then + OPENSSL_VERSION_NUMBER="1.0.0t" + OPENSSL_DIR="ossl-100t" fi # download, compile, and install if it's not already present via travis cache if [ -n "$OPENSSL_DIR" ]; then diff --git a/.travis/run.sh b/.travis/run.sh index 2b94e22f..9619c24a 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -28,6 +28,8 @@ else fi if [[ "${OPENSSL}" == "0.9.8" ]]; then OPENSSL_DIR="ossl-098l" + elif [[ "${OPENSSL}" == "1.0.0" ]]; then + OPENSSL_DIR="ossl-100t" fi if [ -n "$OPENSSL_DIR" ]; then |