Travis: Install Python 3 to run Python 3 tests.

Install Python 3.3 from the Deadsnakes PPA. As this doesn't have pip,
install it manually into ~/.local.

~/.local/bin is apparently in Travis's default PATH, meaning "pip"
doesn't refer to Python 2's pip anymore, but to the manually
installed Python 3 version. Updated the scripts to use version-
suffixed executable names (e.g. pip2.7).

Set CC=cc to use system's default compiler when installing Python
modules, as gcc on OS X had a problem with compiling one of the
dependencies of the Neovim Python module.

2 files changed, 28 insertions, 3 deletions

diff --git a/.ci/before_install.sh b/.ci/before_install.sh
index e70654c9be..2a1ac05569 100755
--- a/.ci/before_install.sh
+++ b/.ci/before_install.sh
@@ -10,4 +10,19 @@ fi
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   brew update
 fi
-pip install --user --upgrade pip
+
+echo "Upgrade Python 2's pip."
+pip2.7 install --user --upgrade pip
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  echo "Install Python 3."
+  brew install python3
+  echo "Upgrade Python 3's pip."
+  pip3 install --user --upgrade pip
+else
+  # TODO: Replace with upgrade when Travis gets python3-pip package.
+  echo "Install pip for Python 3."
+  curl -sSL https://bootstrap.pypa.io/get-pip.py -o "${HOME}/get-pip.py"
+  # After this, pip in PATH will refer to Python 3's pip.
+  python3.3 "${HOME}/get-pip.py" --user --upgrade
+fi
diff --git a/.ci/install.sh b/.ci/install.sh
index 42c8026396..ad3ef1b8b7 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -14,7 +14,17 @@ elif [[ "${BUILD_MINGW}" == ON ]]; then
   # binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-dev mingw-w64-tools
 
   echo "Downloading MinGW..."
-  wget -q -O - "http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/rubenvb/gcc-4.8-release/i686-w64-mingw32-gcc-4.8.0-linux64_rubenvb.tar.xz" | tar xJf - -C "${HOME}/.local"
+  curl -sSL "http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/rubenvb/gcc-4.8-release/i686-w64-mingw32-gcc-4.8.0-linux64_rubenvb.tar.xz" | tar xJf - -C "${HOME}/.local"
 fi
 
-pip install --user --upgrade cpp-coveralls neovim
+# Set CC to default to avoid compilation problems
+# when installing Python modules.
+echo "Install neovim module and coveralls for Python 2."
+CC=cc pip2.7 install --user --upgrade neovim cpp-coveralls
+
+echo "Install neovim module for Python 3."
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  CC=cc pip3 install --user --upgrade neovim
+else
+  CC=cc pip3.3 install --user --upgrade neovim
+fi