diff options
| author | Laurens Van Houtven <_@lvh.io> | 2015-05-14 12:41:07 -0700 |
|---|---|---|
| committer | Laurens Van Houtven <_@lvh.io> | 2015-05-14 12:41:07 -0700 |
| commit | ee4173baedd2a414d2618c337525c1f73fce86e3 (patch) | |
| tree | f9004523a169f3fb7728a8af5623000daf1f6ef5 | |
| parent | 5ffdcf56c9034556c9eda107dffbce365d41c699 (diff) | |
| parent | 410b6d306693a33bac0d89eee010c077135e7893 (diff) | |
| download | pyopenssl-ee4173baedd2a414d2618c337525c1f73fce86e3.tar.gz | |
Merge remote-tracking branch 'origin/master' into test-metadata
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a1c9765..cc63957 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,17 @@ sudo: false language: python +env: + global: + - LC_ALL=en_US.UTF-8 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" @@ -58,7 +64,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 @@ -83,11 +89,12 @@ 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" export CFLAGS="-I/usr/local/opt/openssl/include" + export PATH="/usr/local/opt/openssl/bin:$PATH" fi ~/.venv/bin/tox @@ -2,6 +2,9 @@ envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest,lint [testenv] +whitelist_externals = + openssl +passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH deps = setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies coverage @@ -11,6 +14,7 @@ setenv = # with extra packages. PYTHONPATH= commands = + openssl version python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))" python -c "import cryptography; print(cryptography.__version__)" coverage run --branch --source=OpenSSL setup.py test |