diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-06 10:50:03 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-06 10:50:03 -0400 |
| commit | 4a3741e0d3dbf962e3e55b973968f625e2a1f544 (patch) | |
| tree | aa39bab411d8a943f55c94597abd2b929821fb00 | |
| parent | b6916ba91753a7ac8961efb8732354dca429e3d3 (diff) | |
| parent | b4af4f61d439b4caeff4d11c81a8923fb9cb82eb (diff) | |
| download | cryptography-4a3741e0d3dbf962e3e55b973968f625e2a1f544.tar.gz cryptography-4a3741e0d3dbf962e3e55b973968f625e2a1f544.tar.bz2 cryptography-4a3741e0d3dbf962e3e55b973968f625e2a1f544.zip | |
Merge pull request #2763 from alex/travis-install-cleanup
Several updates to the travis install script:
| -rwxr-xr-x | .travis/install.sh | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index f163f217..e5b5f52d 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -15,10 +15,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then eval "$(pyenv init -)" case "${TOXENV}" in - py26) - curl -O https://bootstrap.pypa.io/get-pip.py - python get-pip.py --user - ;; py27) curl -O https://bootstrap.pypa.io/get-pip.py python get-pip.py --user @@ -51,8 +47,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv rehash python -m pip install --user virtualenv else - # temporary pyenv installation to get latest pypy before container infra upgrade - # now using the -latest because of a segfault bug we're encountering in 2.6.1 + # 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 PYENV_ROOT="$HOME/.pyenv" @@ -62,24 +58,26 @@ else pyenv global pypy-4.0.1 fi if [[ "${OPENSSL}" == "0.9.8" ]]; then - # We use 0.9.8l rather than zh because we have some branches for handling - # < 0.9.8m that won't be exercised with a newer OpenSSL. (RHEL5 is 0.9.8e with - # patches, but while that's in jenkins we don't get coverage data from it). + # We use 0.9.8l rather than zh because we have some branches for + # handling < 0.9.8m that won't be exercised with a newer OpenSSL. + # (RHEL5 is 0.9.8e with patches, but while that's in jenkins we don't + # get coverage data from it). OPENSSL_VERSION_NUMBER="0.9.8l" OPENSSL_DIR="ossl-098l" elif [[ "${OPENSSL}" == "1.0.0" ]]; then OPENSSL_VERSION_NUMBER="1.0.0t" OPENSSL_DIR="ossl-100t" fi - # download, compile, and install if it's not already present via travis cache + # download, compile, and install if it's not already present via travis + # cache if [ -n "$OPENSSL_DIR" ]; then if [[ ! -f "$HOME/$OPENSSL_DIR/bin/openssl" ]]; then curl -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION_NUMBER.tar.gz tar zxf openssl-$OPENSSL_VERSION_NUMBER.tar.gz cd openssl-$OPENSSL_VERSION_NUMBER ./config shared no-asm no-ssl2 -fPIC --prefix="$HOME/$OPENSSL_DIR" - # modify the shlib version to a unique one to make sure the dynamic linker - # doesn't load the system one. + # modify the shlib version to a unique one to make sure the dynamic + # linker doesn't load the system one. sed -i "s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=100/" Makefile sed -i "s/^SHLIB_MINOR=.*/SHLIB_MINOR=0.0/" Makefile sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=100.0.0/" Makefile |