diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-03 00:44:08 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-03 00:44:08 -0500 |
| commit | b34f83957aed3f821748bf04a517af31633432c3 (patch) | |
| tree | 4b797d18c1c52dd79eefe8f615716681b675fddc | |
| parent | 11d187141383d7630118c65bf8da2406c82d1d6f (diff) | |
| parent | a490aafd0da06cb6b3fe0f04c9637b1bc015b764 (diff) | |
| download | cryptography-b34f83957aed3f821748bf04a517af31633432c3.tar.gz cryptography-b34f83957aed3f821748bf04a517af31633432c3.tar.bz2 cryptography-b34f83957aed3f821748bf04a517af31633432c3.zip | |
Merge pull request #2630 from reaperhulk/travis-update-osx
update osx_image values based on travis supported versions
| -rw-r--r-- | .travis.yml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 4ded04d8..b4d3d056 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,43 +51,46 @@ matrix: env: TOXENV=py3pep8 - language: generic os: osx - osx_image: xcode7 + # 7.1 is OS X 10.10.x + # see: https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions + osx_image: xcode7.1 env: TOXENV=py26 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: xcode7 + osx_image: xcode7.1 env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: xcode7 + osx_image: xcode7.1 env: TOXENV=py33 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: xcode7 + osx_image: xcode7.1 env: TOXENV=py34 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: xcode7 + osx_image: xcode7.1 env: TOXENV=py35 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: xcode7 + osx_image: xcode7.1 env: TOXENV=pypy CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: xcode7 + osx_image: xcode7.1 env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=0 - language: generic os: osx - osx_image: osx10.11 + # 7.2 is OS X 10.11.x + osx_image: xcode7.2 env: TOXENV=py26 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: osx10.11 + osx_image: xcode7.2 env: TOXENV=py27 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 - language: generic os: osx - osx_image: xcode7 + osx_image: xcode7.2 env: TOXENV=docs CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 install: |