diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-11-01 15:34:23 +0900 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-11-01 15:34:23 +0900 |
| commit | 4d771503e231ebfe66dda06efa6ca2453926e0b6 (patch) | |
| tree | 9cf13e7f833b70b5c652a324211a0cd6d1e15036 /.travis | |
| parent | 1a13a5ffccbc41f3b615016397e9d9aed6e61d59 (diff) | |
| download | cryptography-4d771503e231ebfe66dda06efa6ca2453926e0b6.tar.gz cryptography-4d771503e231ebfe66dda06efa6ca2453926e0b6.tar.bz2 cryptography-4d771503e231ebfe66dda06efa6ca2453926e0b6.zip | |
switch to directly grabbing pyenv rather than using homebrew on mac
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 10 | ||||
| -rwxr-xr-x | .travis/run.sh | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 21e41523..bab2a173 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) 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" |