diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-12 21:14:57 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-12 21:14:57 -0800 |
| commit | f290f7d92d7608c6286b92ed235fdf4259627a5a (patch) | |
| tree | db43c379791b83688400ca3f98debc3479881640 /.travis.yml | |
| parent | a2fdd5270b274c934fff64d66b110943d97460ca (diff) | |
| parent | 26287be0dccc51730608475fdde8f0b3f474e20e (diff) | |
| download | cryptography-f290f7d92d7608c6286b92ed235fdf4259627a5a.tar.gz cryptography-f290f7d92d7608c6286b92ed235fdf4259627a5a.tar.bz2 cryptography-f290f7d92d7608c6286b92ed235fdf4259627a5a.zip | |
Merge pull request #448 from reaperhulk/travis-add-brew-osx
Add Homebrew OpenSSL to Travis OS X Matrix
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index babea99b..a70bb8cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,10 @@ install: - ./.travis/install.sh script: - - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV + - ./.travis/run.sh after_success: - - coveralls + - source ~/.venv/bin/activate && coveralls notifications: irc: @@ -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 |