diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-14 10:03:47 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-14 10:03:47 -0500 |
| commit | 410b6d306693a33bac0d89eee010c077135e7893 (patch) | |
| tree | df1339f1401e1f960998e58be6bee5c991ea1455 | |
| parent | 99e7af2569a80bab0e229d1853cd33af6b40a51f (diff) | |
| parent | 1b8135be38e498d25f6ec69ab1290ae571e15829 (diff) | |
| download | pyopenssl-410b6d306693a33bac0d89eee010c077135e7893.tar.gz | |
Merge pull request #263 from hynek/osx-homebrew-own-binary
Ensure OpenSSL CLI matches lib on homebrew
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | tox.ini | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 717c32e..f49e780 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,6 +90,7 @@ script: 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,7 +2,9 @@ envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest [testenv] -passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS +whitelist_externals = + openssl +passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH deps = setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies coverage @@ -12,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 |