From 6c0e43f1edd43e75bf1b341c87fee066a39ba393 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 4 Feb 2014 16:50:08 -0800 Subject: Run the doc tests under OS X --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b77a7b76..b7fa090e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,9 +86,6 @@ matrix: - os: osx env: TOX_ENV=py3pep8 compiler: gcc - - os: osx - env: TOX_ENV=docs - compiler: clang - os: osx env: TOX_ENV=pep8 compiler: clang -- cgit v1.2.3 From 6a1883545efdcfbcc03583cc682e11051128a766 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 4 Feb 2014 17:18:30 -0800 Subject: Fix for OS X --- .travis/install.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index b6dd5acc..c39b5309 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 -- cgit v1.2.3 From 5278cd9fe4f3c96adcd77dabcd6eecc7985b9abf Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 4 Feb 2014 17:24:12 -0800 Subject: Everything about bash is the worst --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index c39b5309..5b4cc516 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -16,7 +16,7 @@ if [[ "${OPENSSL}" == "0.9.8" ]]; then fi fi -if [[ "${TOX_ENV}" == "docs"]]; then +if [[ "${TOX_ENV}" == "docs" ]]; then if [[ "$(uname -s)" == "Darwin" ]]; then brew update brew install enchant -- cgit v1.2.3 From 99951455325713e8c487ccedcfefdf4ba4c984b0 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 4 Feb 2014 17:37:38 -0800 Subject: Docs need virtualenv as well --- .travis/install.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis/install.sh b/.travis/install.sh index 5b4cc516..7e77fc87 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -56,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 -- cgit v1.2.3 From 6bee2abfccd23c7c3d0fba0a629cee440d3c9a83 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 5 Feb 2014 07:44:12 -0800 Subject: Removed pointless anchor --- docs/hazmat/bindings/commoncrypto.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3