diff options
| author | Hynek Schlawack <hs@ox.cx> | 2015-11-01 10:15:15 +0100 |
|---|---|---|
| committer | Hynek Schlawack <hs@ox.cx> | 2015-11-01 10:15:15 +0100 |
| commit | a22d52b99f0587ca653087854e1da5ff72a19583 (patch) | |
| tree | d9b70393c63c9986e072e27412dd707802868bb3 | |
| parent | 1a13a5ffccbc41f3b615016397e9d9aed6e61d59 (diff) | |
| parent | 2be252fe50de8ca896490aa4fed2e7a6fcb231ea (diff) | |
| download | cryptography-a22d52b99f0587ca653087854e1da5ff72a19583.tar.gz cryptography-a22d52b99f0587ca653087854e1da5ff72a19583.tar.bz2 cryptography-a22d52b99f0587ca653087854e1da5ff72a19583.zip | |
Merge pull request #2462 from reaperhulk/pypy4-mac
pypy 4 for travis mac builders
| -rwxr-xr-x | .travis/install.sh | 14 | ||||
| -rwxr-xr-x | .travis/run.sh | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 21e41523..63d55ed3 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -5,16 +5,16 @@ set -x if [[ "$(uname -s)" == 'Darwin' ]]; then brew update || brew update - brew install pyenv - brew outdated pyenv || brew upgrade pyenv if [[ "${OPENSSL}" != "0.9.8" ]]; then brew outdated openssl || brew upgrade openssl fi - if which -s pyenv; then - eval "$(pyenv init -)" - fi + # install pyenv + git clone https://github.com/yyuu/pyenv.git ~/.pyenv + PYENV_ROOT="$HOME/.pyenv" + PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init -)" case "${TOXENV}" in py26) @@ -38,8 +38,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv global 3.5.0 ;; pypy) - pyenv install pypy-c-jit-latest - pyenv global pypy-c-jit-latest + pyenv install pypy-4.0.0 + pyenv global pypy-4.0.0 ;; pypy3) pyenv install pypy3-2.4.0 diff --git a/.travis/run.sh b/.travis/run.sh index cf1bbe28..bda9b545 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -4,7 +4,11 @@ set -e set -x if [[ "$(uname -s)" == "Darwin" ]]; then + # initialize our pyenv + PYENV_ROOT="$HOME/.pyenv" + PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" + if [[ "${OPENSSL}" != "0.9.8" ]]; then # set our flags to use homebrew openssl export ARCHFLAGS="-arch x86_64" |