diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-09-25 15:33:34 -0400 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-09-25 15:33:34 -0400 |
commit | e8fbbe7e638cc8baf1cacf27c54e7a2ddac9ef1a (patch) | |
tree | 6ada357297e0d2da9ae4e6a6ac2199bf6d2c133f | |
parent | 65778cfdb25519e8abeadcba8218c3131f4d469e (diff) | |
parent | d903ab6163cd2f799139af3baf80dbebb0f05112 (diff) | |
download | cryptography-e8fbbe7e638cc8baf1cacf27c54e7a2ddac9ef1a.tar.gz cryptography-e8fbbe7e638cc8baf1cacf27c54e7a2ddac9ef1a.tar.bz2 cryptography-e8fbbe7e638cc8baf1cacf27c54e7a2ddac9ef1a.zip |
Merge pull request #2366 from reaperhulk/new-travis
add some el capitan to our travis build matrix
-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 |