commit 22a9d0e8a594848b61adddf4335ee4a87cc97b2c
author Alex Gaynor <alex.gaynor@gmail.com> Wed Feb 05 07:43:38 2014 -0800
committer Alex Gaynor <alex.gaynor@gmail.com> Wed Feb 05 07:43:38 2014 -0800
tree 98f9a0e834c840f36c604c3dec58d45bd7c47d71
parent 99951455325713e8c487ccedcfefdf4ba4c984b0
parent 48ef0c1a319ea3787ac865d67c15dc303c588d70

Merge branch 'master' into osx-docs

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index b77a7b7..b7fa090 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,9 +87,6 @@
           env: TOX_ENV=py3pep8
           compiler: gcc
         - os: osx
-          env: TOX_ENV=docs
-          compiler: clang
-        - os: osx
           env: TOX_ENV=pep8
           compiler: clang
         - os: osx

.travis/install.sh

diff --git a/.travis/install.sh b/.travis/install.sh
index b6dd5ac..7e77fc8 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -16,9 +16,14 @@
     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 @@
             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