diff options
| author | Erik Trauschke <erik.trauschke@gmail.com> | 2015-09-25 13:35:15 -0700 |
|---|---|---|
| committer | Erik Trauschke <erik.trauschke@gmail.com> | 2015-09-25 13:35:15 -0700 |
| commit | ea6983f58728d15e8ee075e643739e7e10798cae (patch) | |
| tree | 0eff62ee701173494632b9e9ade4d1c9d2528652 | |
| parent | 5daefc13780bf55d18b19603784c411ca1783a5a (diff) | |
| parent | e8fbbe7e638cc8baf1cacf27c54e7a2ddac9ef1a (diff) | |
| download | cryptography-ea6983f58728d15e8ee075e643739e7e10798cae.tar.gz cryptography-ea6983f58728d15e8ee075e643739e7e10798cae.tar.bz2 cryptography-ea6983f58728d15e8ee075e643739e7e10798cae.zip | |
Merge branch 'master' into crl_ossl_backend
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 5e30fd68..23c999ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,6 +132,14 @@ matrix: env: TOXENV=pypy OPENSSL=0.9.8 - language: generic os: osx + osx_image: osx10.11 + env: TOXENV=py26 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + - language: generic + os: osx + osx_image: osx10.11 + env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 + - language: generic + os: osx osx_image: xcode7 env: TOXENV=docs |