aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml16
-rwxr-xr-x.travis/install.sh2
2 files changed, 17 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index c7413ea9..5be093de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
sudo: false
+
language: python
+
cache:
directories:
- $HOME/.cache/pip
+
matrix:
include:
- python: 2.6 # these are just to make travis's UI a bit prettier
@@ -67,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:
diff --git a/.travis/install.sh b/.travis/install.sh
index 57ece2e6..1baae5ba 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -49,7 +49,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
;;
esac
pyenv rehash
- pip install --user virtualenv
+ python -m pip install --user virtualenv
else
pip install virtualenv
fi