Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ matrix:
include:
- language: generic
os: osx
env: TOXENV=py27
env: TOXENV=py27 OSX_OPENSSL=homebrew
- language: generic
os: osx
env: TOXENV=py27 OSX_OPENSSL=system
- python: "2.6" # these are just to make travis's UI a bit prettier
env: TOXENV=py26
- python: "2.7"
Expand Down Expand Up @@ -58,7 +61,7 @@ matrix:
allow_failures:
- language: generic
os: osx
env: TOXENV=py27
env: TOXENV=py27 OSX_OPENSSL=homebrew
- env: TOXENV=py26-cryptographyMaster
- env: TOXENV=py27-cryptographyMaster
- env: TOXENV=py33-cryptographyMaster
Expand All @@ -82,7 +85,7 @@ install:

script:
- |
if [[ "$(uname -s)" == "Darwin" ]]; then
if [[ "$(uname -s)" == 'Darwin' && $OSX_OPENSSL == 'homebrew' ]]; then
# set our flags to use homebrew openssl
export ARCHFLAGS="-arch x86_64"
export LDFLAGS="-L/usr/local/opt/openssl/lib"
Expand Down