Merge pull request #470 from alex/bind-ecdhe-stuff
Start binding some stuff for ECDHE in pyOpenSSL.
diff --git a/.travis.yml b/.travis.yml
index babea99..a70bb8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,10 @@
- ./.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 @@
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
diff --git a/.travis/install.sh b/.travis/install.sh
index e6ea253..1e3b170 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -3,10 +3,17 @@
set -e
set -x
-if [[ "${OPENSSL}" == "0.9.8" && "$(uname -s)" != "Darwin" ]]; then
- sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main"
- sudo apt-get -y update
- sudo apt-get install -y --force-yes libssl-dev/lucid
+if [[ "${OPENSSL}" == "0.9.8" ]]; then
+ if [[ "$(uname -s)" != "Darwin" ]]; then
+ sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main"
+ sudo apt-get -y update
+ sudo apt-get install -y --force-yes libssl-dev/lucid
+ else
+ # travis has openssl installed via brew already, but let's be sure
+ if [[ "$(brew list | grep openssl)" != "openssl" ]]; then
+ brew install openssl
+ fi
+ fi
fi
if [[ "${TOX_ENV}" == "docs" && "$(name -s)" != "Darwin" ]]; then
diff --git a/.travis/run.sh b/.travis/run.sh
new file mode 100755
index 0000000..4c01d67
--- /dev/null
+++ b/.travis/run.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+set -x
+
+if [[ "$(uname -s)" == "Darwin" ]]; then
+ eval "$(pyenv init -)"
+ if [[ "${OPENSSL}" != "0.9.8" ]]; then
+ # so 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"
+ fi
+fi
+source ~/.venv/bin/activate
+tox -e $TOX_ENV
diff --git a/dev-requirements.txt b/dev-requirements.txt
index b2a6c79..70a2b9b 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -5,6 +5,7 @@
pretend
pytest
sphinx
+sphinxcontrib-spelling
sphinx_rtd_theme
tox
twine
diff --git a/docs/conf.py b/docs/conf.py
index a42dcb2..fbd6d57 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,6 +19,11 @@
except ImportError:
sphinx_rtd_theme = None
+try:
+ from sphinxcontrib import spelling
+except ImportError:
+ spelling = None
+
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -38,9 +43,11 @@
'sphinx.ext.intersphinx',
'sphinx.ext.viewcode',
'cryptography-docs',
- 'sphinxcontrib.spelling',
]
+if spelling is not None:
+ extensions.append('sphinxcontrib.spelling')
+
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']