diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-05-20 22:35:10 -0700 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-05-20 22:35:10 -0700 |
commit | ae59061ebb073cf2b2d50b4350fda870c8586564 (patch) | |
tree | 3d19f1c9b8b690c051212eb1d5f9556d4c743693 /.travis | |
parent | f9b3b1592d1e0fb0e49b46d603cf0301f7d31cf3 (diff) | |
download | cryptography-ae59061ebb073cf2b2d50b4350fda870c8586564.tar.gz cryptography-ae59061ebb073cf2b2d50b4350fda870c8586564.tar.bz2 cryptography-ae59061ebb073cf2b2d50b4350fda870c8586564.zip |
Switch from 12.04 to 14.04 on travis (#3559)
* Switch from 12.04 to 14.04 on travis
* test?
* fix for pyenv
* sigh
* try removing this entirely
* one more try
* empty commit to retrigger travis
Diffstat (limited to '.travis')
-rwxr-xr-x | .travis/install.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 14c29dfe..3b6de00d 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -10,7 +10,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then brew outdated openssl || brew upgrade openssl # install pyenv - git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv + git clone --depth 1 https://github.com/pyenv/pyenv ~/.pyenv PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" @@ -56,7 +56,8 @@ else # temporary pyenv installation to get latest pypy until the travis # container infra is upgraded if [[ "${TOXENV}" = pypy* ]]; then - git clone https://github.com/yyuu/pyenv.git ~/.pyenv + rm -rf ~/.pyenv + git clone https://github.com/pyenv/pyenv ~/.pyenv PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" |