diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 23:51:30 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-10 00:11:13 -0600 |
| commit | c4359578acac27d9709c284a1f350c44245c60ef (patch) | |
| tree | cad0f27003dca2e5eac3e4f29ccbc26b8b3535e2 | |
| parent | ccb4f6f4d9ce86208cfe40451f390191e4bf3596 (diff) | |
| download | cryptography-c4359578acac27d9709c284a1f350c44245c60ef.tar.gz cryptography-c4359578acac27d9709c284a1f350c44245c60ef.tar.bz2 cryptography-c4359578acac27d9709c284a1f350c44245c60ef.zip | |
remove unneeded openssl bottle
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/install.sh | 6 | ||||
| -rwxr-xr-x | .travis/run.sh | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index e77a3b26..a70bb8cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ script: - ./.travis/run.sh after_success: - - coveralls + - source ~/.venv/bin/activate && coveralls notifications: irc: diff --git a/.travis/install.sh b/.travis/install.sh index 3f0f8ffd..8d6840f2 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -43,12 +43,6 @@ if [[ "$(uname -s)" == "Darwin" ]]; then ;; esac pyenv rehash - if [[ "${OPENSSL}" != "0.9.8" ]]; then - /usr/local/opt/openssl/bin/openssl version - curl -O https://langui.sh/travis/openssl-1.0.1f.mavericks.bottle.tar.gz - brew install openssl-1.0.1f.mavericks.bottle.tar.gz - /usr/local/opt/openssl/bin/openssl version - fi else # add mega-python ppa sudo add-apt-repository -y ppa:fkrull/deadsnakes diff --git a/.travis/run.sh b/.travis/run.sh index 2d99f8c4..8b3093df 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -6,6 +6,8 @@ set -x if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)" if [[ "${OPENSSL}" != "0.9.8" ]]; then + # travis has 1.0.1e installed via homebrew on OS X by default + # so set our flags to use that export ARCHFLAGS="-arch x86_64" export LDFLAGS="-L/usr/local/opt/openssl/lib" export CFLAGS="-I/usr/local/opt/openssl/include" |