diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | .travis/install.sh | 16 |
2 files changed, 13 insertions, 6 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 |