From 57c2204aaaa50f6397974308f363d890bdd89e55 Mon Sep 17 00:00:00 2001 From: Hynek Schlawack Date: Thu, 14 May 2015 16:31:13 +0200 Subject: [PATCH 1/3] Ensure OpenSSL CLI matches lib on homebrew --- .travis.yml | 1 + tox.ini | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e49fbf029..b2ab3f258 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,6 +87,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" fi ~/.venv/bin/tox diff --git a/tox.ini b/tox.ini index 178cc3edd..4a2b679c5 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest [testenv] -passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS +passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH deps = setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies coverage @@ -12,6 +12,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 From d018c9a4229245e9f0f6abef82cdc3d6054bab2d Mon Sep 17 00:00:00 2001 From: Hynek Schlawack Date: Thu, 14 May 2015 16:34:07 +0200 Subject: [PATCH 2/3] Let's not be too extreme --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2ab3f258..4eab2b74b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,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" + export PATH="/usr/local/opt/openssl/bin:$PATH" fi ~/.venv/bin/tox From 1b8135be38e498d25f6ec69ab1290ae571e15829 Mon Sep 17 00:00:00 2001 From: Hynek Schlawack Date: Thu, 14 May 2015 16:52:56 +0200 Subject: [PATCH 3/3] Whitelist openssl in tox --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 4a2b679c5..a4cab3764 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,8 @@ envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest [testenv] +whitelist_externals = + openssl passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH deps = setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies