diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 23:24:44 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-09 23:24:44 -0600 |
| commit | fbb128fa06b81d64d2e9d27f17d65685b3d6624c (patch) | |
| tree | 6d0a29eb14cbfb370ccfd88570dd53cddf33a5ff | |
| parent | f2870eafeadda92ce9a512c9594dbaf1b539cb6e (diff) | |
| download | cryptography-fbb128fa06b81d64d2e9d27f17d65685b3d6624c.tar.gz cryptography-fbb128fa06b81d64d2e9d27f17d65685b3d6624c.tar.bz2 cryptography-fbb128fa06b81d64d2e9d27f17d65685b3d6624c.zip | |
add brewed openssl to travis osx
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rwxr-xr-x | .travis/install.sh | 4 |
2 files changed, 5 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index babea99b..950cb487 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ install: - ./.travis/install.sh script: - - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV + - if [[ "$(uname -s)" == "Darwin" ]]; then export ARCHFLAGS="-arch x86_64" && export LDFLAGS="-L/usr/local/opt/openssl/lib" && export CFLAGS="-I/usr/local/opt/openssl/include" && eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV after_success: - coveralls @@ -64,21 +64,6 @@ matrix: env: TOX_ENV=pypy compiler: gcc - os: osx - env: TOX_ENV=py26 - compiler: clang - - os: osx - env: TOX_ENV=py27 - compiler: clang - - os: osx - env: TOX_ENV=py32 - compiler: clang - - os: osx - env: TOX_ENV=py33 - compiler: clang - - os: osx - env: TOX_ENV=pypy - compiler: clang - - os: osx env: TOX_ENV=py26 OPENSSL=0.9.8 compiler: gcc - os: osx diff --git a/.travis/install.sh b/.travis/install.sh index 8d6840f2..777ca87a 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -43,6 +43,10 @@ if [[ "$(uname -s)" == "Darwin" ]]; then ;; esac pyenv rehash + if [[ "${OPENSSL}" != "0.9.8" ]]; then + curl -O https://langui.sh/travis/openssl-1.0.1f.mavericks.bottle.tar.gz + brew install openssl-1.0.1f.mavericks.bottle.tar.gz + fi else # add mega-python ppa sudo add-apt-repository -y ppa:fkrull/deadsnakes |