From 8950beeb045c44a198e4a6539ddc7abb0ccc1379 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 26 Dec 2016 19:23:54 +0100
Subject: ci: Upgrade to ubuntu 14.04 "trusty"

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 039a00cce8..fad2113aea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 sudo: false
 language: c
 
-- 
cgit 


From f2be05d6a3fc851cc2a722b7dfa8cf5e8fcae1dd Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 24 Dec 2016 23:24:57 +0100
Subject: ci: Install cscope, remove deadsnakes PPA

The travis ubuntu "trusty" image already pre-installs python 3.5.
https://docs.travis-ci.com/user/trusty-ci-environment
---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fad2113aea..a289b176fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,8 +91,6 @@ after_success:  .ci/after_success.sh
 addons:
   apt:
     sources:
-      # TODO: Remove PPA when Travis gets Python >=3.3.
-      - deadsnakes
       - ubuntu-toolchain-r-test
       - llvm-toolchain-precise-3.8
     packages:
@@ -101,6 +99,7 @@ addons:
       - build-essential
       - clang-3.8
       - cmake
+      - cscope
       - g++-5-multilib
       - g++-multilib
       - gcc-5-multilib
@@ -110,7 +109,6 @@ addons:
       - libtool
       - llvm-3.8-dev
       - pkg-config
-      - python3.3-dev
       - unzip
       - valgrind
       - xclip
-- 
cgit 


From 068399b13b35e2c28c6139b106f6afe522700a7d Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 27 Dec 2016 23:44:36 +0100
Subject: ci: Upgrade pip3 (instead of install)

---
 .ci/before_install.sh | 11 ++++-------
 .ci/install.sh        |  6 +-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.ci/before_install.sh b/.ci/before_install.sh
index 1bdd89de42..9aac37de12 100755
--- a/.ci/before_install.sh
+++ b/.ci/before_install.sh
@@ -11,18 +11,15 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   brew update
 fi
 
-echo "Upgrade Python 2's pip."
+echo "Upgrade Python 2 pip."
 pip2.7 -q install --user --upgrade pip
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   echo "Install Python 3."
   brew install python3
-  echo "Upgrade Python 3's pip."
+  echo "Upgrade Python 3 pip."
   pip3 -q 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
+  echo "Upgrade Python 3 pip."
+  pip3 -q install --user --upgrade pip
 fi
diff --git a/.ci/install.sh b/.ci/install.sh
index 9df5b6e980..98d3dc01cb 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -17,11 +17,7 @@ echo "Install neovim module and coveralls for Python 2."
 CC=cc pip2.7 -q install --user --upgrade neovim cpp-coveralls
 
 echo "Install neovim module for Python 3."
-if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  CC=cc pip3 -q install --user --upgrade neovim
-else
-  CC=cc pip3.3 -q install --user --upgrade neovim
-fi
+CC=cc pip3 -q install --user --upgrade neovim
 
 echo "Install neovim RubyGem."
 gem install --no-document --version ">= 0.2.0" neovim
-- 
cgit