diff options
| author | Alexander Gaynor <alex.gaynor@gmail.com> | 2014-07-19 10:55:22 -0700 |
|---|---|---|
| committer | Alexander Gaynor <alex.gaynor@gmail.com> | 2014-07-19 10:55:22 -0700 |
| commit | 51a05d665ebc7d11fadb739923dbbfee9bc587cc (patch) | |
| tree | 0f8095127630c1767ff7325dcdc75936f35610cb /.travis/install.sh | |
| parent | 2bf11cdc18d244fdf1620120cfb56f1b529e0c7d (diff) | |
| parent | ad116e26d102651ab6dc2752ae21afb92b72ad6f (diff) | |
| download | cryptography-51a05d665ebc7d11fadb739923dbbfee9bc587cc.tar.gz cryptography-51a05d665ebc7d11fadb739923dbbfee9bc587cc.tar.bz2 cryptography-51a05d665ebc7d11fadb739923dbbfee9bc587cc.zip | |
Merge branch 'master' into pem-loading-backend
Diffstat (limited to '.travis/install.sh')
| -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) |