diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-05 10:06:11 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-05 10:06:11 -0600 |
| commit | c16bddc6cd9add175f4577922afc42284b871181 (patch) | |
| tree | 953ecac2041edfa85f63a99b68888dcc6427f50d | |
| parent | 48ef0c1a319ea3787ac865d67c15dc303c588d70 (diff) | |
| parent | 6bee2abfccd23c7c3d0fba0a629cee440d3c9a83 (diff) | |
| download | cryptography-c16bddc6cd9add175f4577922afc42284b871181.tar.gz cryptography-c16bddc6cd9add175f4577922afc42284b871181.tar.bz2 cryptography-c16bddc6cd9add175f4577922afc42284b871181.zip | |
Merge pull request #562 from alex/osx-docs
Run the doc tests under OS X
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | .travis/install.sh | 16 | ||||
| -rw-r--r-- | docs/hazmat/bindings/commoncrypto.rst | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b77a7b76..b7fa090e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,9 +87,6 @@ matrix: env: TOX_ENV=py3pep8 compiler: gcc - os: osx - env: TOX_ENV=docs - compiler: clang - - os: osx env: TOX_ENV=pep8 compiler: clang - os: osx diff --git a/.travis/install.sh b/.travis/install.sh index b6dd5acc..7e77fc87 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -16,9 +16,14 @@ if [[ "${OPENSSL}" == "0.9.8" ]]; then fi fi -if [[ "${TOX_ENV}" == "docs" && "$(name -s)" != "Darwin" ]]; then - sudo apt-get -y update - sudo apt-get install libenchant-dev +if [[ "${TOX_ENV}" == "docs" ]]; then + if [[ "$(uname -s)" == "Darwin" ]]; then + brew update + brew install enchant + else + sudo apt-get -y update + sudo apt-get install libenchant-dev + fi fi if [[ "$(uname -s)" == "Darwin" ]]; then @@ -51,6 +56,11 @@ if [[ "$(uname -s)" == "Darwin" ]]; then pyenv global 3.3.2 pip install virtualenv ;; + docs) + curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python get-pip.py + sudo pip install virtualenv + ;; esac pyenv rehash else diff --git a/docs/hazmat/bindings/commoncrypto.rst b/docs/hazmat/bindings/commoncrypto.rst index c4f614c2..50dbe69a 100644 --- a/docs/hazmat/bindings/commoncrypto.rst +++ b/docs/hazmat/bindings/commoncrypto.rst @@ -27,4 +27,4 @@ Mac OS X. .. _`CFFI`: https://cffi.readthedocs.org/ -.. _`CommonCrypto`: https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man3/Common%20Crypto.3cc.html#//apple_ref/doc/man/3cc/CommonCrypto +.. _`CommonCrypto`: https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man3/Common%20Crypto.3cc.html |