From 41f528677d56cf373cc36c5bb923cd90192b9e85 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Sat, 31 Mar 2018 13:21:08 +0100 Subject: Fix Travis build environment Newest Meson requires Python 3.5 which isn't available in Trusty. Pip version pin no longer necessary. --- .travis.yml | 2 -- test/travis-install.sh | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef6c6f6..888c954 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ addons: - 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 5d37a00..2546808 100755 --- a/test/travis-install.sh +++ b/test/travis-install.sh @@ -2,7 +2,8 @@ set -e -sudo python3 -m pip install pytest meson +# Meson 0.45 requires Python 3.5 or newer +sudo python3 -m pip install pytest meson==0.44 wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip unzip ninja-linux.zip chmod 755 ninja -- cgit v1.2.3