Merge pull request #5827 from justinmk/travisupdate

ci: Install cscope, remove deadsnakes PPA

.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 "Upgrade Python 3 pip."
-  echo "Install pip for Python 3."
+  pip3 -q install --user --upgrade pip
-  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

.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
-  CC=cc pip3 -q install --user --upgrade neovim
-else
-  CC=cc pip3.3 -q install --user --upgrade neovim
-fi
 
 echo "Install neovim RubyGem."
 gem install --no-document --version ">= 0.2.0" neovim

.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 sudo: false
 language: c
 
@@ -92,8 +93,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:
@@ -102,6 +101,7 @@ addons:
       - build-essential
       - clang-3.8
       - cmake
+      - cscope
       - g++-5-multilib
       - g++-multilib
       - gcc-5-multilib
@@ -111,7 +111,6 @@ addons:
       - libtool
       - llvm-3.8-dev
       - pkg-config
-      - python3.3-dev
       - unzip
       - valgrind
       - xclip