aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-14 23:33:58 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-14 23:33:58 -0400
commit6ac7230f61486de1546df06a5bdef24f6cc34a49 (patch)
treef1cb93ffc2a50af638e34036efc33600da3b72d6 /.travis.yml
parent388f92ab5cfd5c60fcd8712e5889c4ded300959b (diff)
downloadcryptography-6ac7230f61486de1546df06a5bdef24f6cc34a49.tar.gz
cryptography-6ac7230f61486de1546df06a5bdef24f6cc34a49.tar.bz2
cryptography-6ac7230f61486de1546df06a5bdef24f6cc34a49.zip
set osx_image on all the os x builds, instead of global
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 559d6700..5be093de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
sudo: false
-osx_image: beta-xcode6.2
language: python
@@ -71,42 +70,55 @@ matrix:
env: TOXENV=py3pep8
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py26
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py27
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py33
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py34
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=pypy
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=pypy3
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py26 OPENSSL=0.9.8
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py27 OPENSSL=0.9.8
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py33 OPENSSL=0.9.8
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=py34 OPENSSL=0.9.8
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=pypy OPENSSL=0.9.8
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=pypy3 OPENSSL=0.9.8
- language: generic
os: osx
+ osx_image: beta-xcode6.2
env: TOXENV=docs
install: