aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-07-18 12:40:46 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-07-18 12:40:46 -0700
commit06de17fe795015ce9b96a7e2d918c0b8907389fb (patch)
tree8944f14c36ec244f1ef405afd031ae890d4255e6
parent09db2fa40092c08e5d11eb68363819f2bc7ede19 (diff)
parent610f1e4832c63927d4fe1a4349e5b705696e4ed3 (diff)
downloadcryptography-06de17fe795015ce9b96a7e2d918c0b8907389fb.tar.gz
cryptography-06de17fe795015ce9b96a7e2d918c0b8907389fb.tar.bz2
cryptography-06de17fe795015ce9b96a7e2d918c0b8907389fb.zip
Merge pull request #1273 from reaperhulk/fix-travis-osx
update travis.yml to fix os x builders
-rwxr-xr-x.travis/install.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/.travis/install.sh b/.travis/install.sh
index 3582ea12..fafc4cad 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -33,8 +33,6 @@ if [[ "${TOX_ENV}" == "docs" ]]; then
fi
if [[ "$DARWIN" = true ]]; then
- brew update
- brew install pyenv
if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi
case "${TOX_ENV}" in
py26)
@@ -48,8 +46,8 @@ if [[ "$DARWIN" = true ]]; then
sudo pip install virtualenv
;;
pypy)
- pyenv install pypy-2.3
- pyenv global pypy-2.3
+ pyenv install pypy-2.3.1
+ pyenv global pypy-2.3.1
pip install virtualenv
;;
py32)
@@ -63,8 +61,8 @@ if [[ "$DARWIN" = true ]]; then
pip install virtualenv
;;
py34)
- pyenv install 3.4.0
- pyenv global 3.4.0
+ pyenv install 3.4.1
+ pyenv global 3.4.1
pip install virtualenv
;;
docs)