diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-05 14:24:11 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-05 14:24:11 -0500 |
| commit | b37ab918b3376781d4a03c81ae41aa288e4477c3 (patch) | |
| tree | 8a782243977cbd093c027b31515eb8d0b2fd92a5 | |
| parent | 6960600f111de1710b01cc4f4ffc6c023d742cd7 (diff) | |
| download | cryptography-b37ab918b3376781d4a03c81ae41aa288e4477c3.tar.gz cryptography-b37ab918b3376781d4a03c81ae41aa288e4477c3.tar.bz2 cryptography-b37ab918b3376781d4a03c81ae41aa288e4477c3.zip | |
Several updates to the travis install script:
* Remove unused py26 on OSX support
* Updated the accuracy of a comment
* Word-wrapped some other comments
| -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..9b053b87 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 upgrade 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 |