diff options
| author | Alexander Gaynor <alex.gaynor@gmail.com> | 2014-07-18 12:44:19 -0700 |
|---|---|---|
| committer | Alexander Gaynor <alex.gaynor@gmail.com> | 2014-07-18 12:44:19 -0700 |
| commit | 3469feef3889edc56c3c75653558a2be007cc5a3 (patch) | |
| tree | f8cf79dfc7614b6740ec0e64d8e341d133c41e0a | |
| parent | a1f1afa0b7ae4c472a08a0d5c93d72447d1c02d2 (diff) | |
| parent | 06de17fe795015ce9b96a7e2d918c0b8907389fb (diff) | |
| download | cryptography-3469feef3889edc56c3c75653558a2be007cc5a3.tar.gz cryptography-3469feef3889edc56c3c75653558a2be007cc5a3.tar.bz2 cryptography-3469feef3889edc56c3c75653558a2be007cc5a3.zip | |
Merge branch 'master' into reorganize-docs
| -rwxr-xr-x | .travis/install.sh | 10 |
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) |