Travis CI: Don't use deprecated environment

Travis support recommends to install specific pip
version to work around problems in new environment.

diff --git a/.travis.yml b/.travis.yml
index c567183d0d12767a1f7e6fc780b59884bd91b34a..ef6c6f6226885f664edcdd0f53456e4fbb1dc2b3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 sudo: required
 dist: trusty
-group: deprecated-2017Q2
 
 language:
     - c
@@ -14,6 +13,9 @@ addons:
     - clang
     - gcc
     - gcc-6
+    - python3-pip
+before_install:
+   - sudo -H python3 -m pip install pip==8.1.1
 install: test/travis-install.sh
 script: test/travis-build.sh
 

diff --git a/test/travis-install.sh b/test/travis-install.sh
index e01b6b10a89fdd2421d240cc39fbbe62c598be0f..5d37a009276f1d9b0cf8f7d0e831508d09f3575c 100755 (executable)
--- a/test/travis-install.sh
+++ b/test/travis-install.sh
@@ -2,7 +2,6 @@
 
 set -e
 
-sudo ln -svf $(which python3) /usr/bin/python3
 sudo python3 -m pip install pytest meson
 wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
 unzip ninja-linux.zip