diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-03-26 22:48:53 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-13 15:54:51 -0400 |
| commit | e6a5284870b62e4d631c5f885e971d00586ea995 (patch) | |
| tree | 33ee88154377fc6cf34bf4e48880ab1a8c30b0f8 /.travis/install.sh | |
| parent | 249bbd0064d42d78ff51e9a0203db4492453418f (diff) | |
| download | cryptography-e6a5284870b62e4d631c5f885e971d00586ea995.tar.gz cryptography-e6a5284870b62e4d631c5f885e971d00586ea995.tar.bz2 cryptography-e6a5284870b62e4d631c5f885e971d00586ea995.zip | |
try out some new beta docker travis features
Diffstat (limited to '.travis/install.sh')
| -rwxr-xr-x | .travis/install.sh | 53 |
1 files changed, 6 insertions, 47 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index aacfc5a0..f7f3d502 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,7 +3,6 @@ set -e set -x - if [[ "$(uname -s)" == 'Darwin' ]]; then brew update @@ -18,11 +17,11 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then case "${TOXENV}" in py26) curl -O https://bootstrap.pypa.io/get-pip.py - sudo python get-pip.py + python get-pip.py --user ;; py27) curl -O https://bootstrap.pypa.io/get-pip.py - sudo python get-pip.py + python get-pip.py --user ;; py32) brew upgrade pyenv @@ -51,55 +50,15 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then ;; docs) curl -O https://bootstrap.pypa.io/get-pip.py - sudo python get-pip.py + python get-pip.py --user ;; esac pyenv rehash - + pip install --user virtualenv else - sudo add-apt-repository -y ppa:fkrull/deadsnakes - - if [[ "${TOXENV}" == "pypy" ]]; then - sudo add-apt-repository -y ppa:pypy/ppa - fi - - if [[ "${OPENSSL}" == "0.9.8" ]]; then - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ lucid main" - fi - - # Retry `update` on failure, some of the servers aren't super reliable. - sudo apt-get -y update || sudo apt-get -y update || sudo apt-get -y update - - if [[ "${OPENSSL}" == "0.9.8" ]]; then - sudo apt-get install -y --force-yes libssl-dev/lucid - fi - - case "${TOXENV}" in - py26) - sudo apt-get install python2.6 python2.6-dev - ;; - py32) - sudo apt-get install python3.2 python3.2-dev - ;; - py33) - sudo apt-get install python3.3 python3.3-dev - ;; - py34) - sudo apt-get install python3.4 python3.4-dev - ;; - py3pep8) - sudo apt-get install python3.3 python3.3-dev - ;; - pypy) - sudo apt-get install --force-yes pypy pypy-dev - ;; - docs) - sudo apt-get install libenchant-dev - ;; - esac + pip install virtualenv fi -sudo pip install virtualenv -virtualenv ~/.venv +python -m virtualenv ~/.venv source ~/.venv/bin/activate pip install tox coveralls |