From 646a3c417bdb8d0e5bd60991469e7c9ae749901a Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Sat, 31 Mar 2018 12:58:37 +0100
Subject: [PATCH] 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 07b059aa..42a00430 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,6 @@ addons:
     - gcc-6
     - python-docutils
     - 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 478b3855..9a46719f 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