From 78eb7ebc5d1285a6091b64ea00d50b354393c4fc Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Fri, 20 Oct 2017 11:47:31 +0200
Subject: [PATCH 1/5] [travis] also test on python 2.7.6

We install python 2.7.6 using pyenv.

This should help us catch issues like this earlier
https://github.com/fonttools/fonttools/issues/993
---
 .travis.yml               | 13 +++++++++++++
 .travis/before_install.sh |  9 +++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 .travis/before_install.sh

diff --git a/.travis.yml b/.travis.yml
index 3f93304a3..8f0df5dd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,19 @@ matrix:
       env:
         - TOXENV=py35-cov
         - HOMEBREW_NO_AUTO_UPDATE=1
+    - env:
+        - TOXENV=py27-cov
+        - PYENV_VERSION='2.7.6'
+        - PYENV_VERSION_STRING='Python 2.7.6'
+        - TRAVIS_PYENV_VERSION='0.4.0'
+
+cache:
+  - pip
+  - directories:
+    - $HOME/.pyenv_cache
+
+before_install:
+  - source ./.travis/before_install.sh
 
 install:
   - ./.travis/install.sh
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
new file mode 100755
index 000000000..a76939899
--- /dev/null
+++ b/.travis/before_install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+set -x
+
+if [[ -n "$PYENV_VERSION" ]]; then
+    wget https://github.com/praekeltfoundation/travis-pyenv/releases/download/${TRAVIS_PYENV_VERSION}/setup-pyenv.sh
+    source setup-pyenv.sh
+fi

From b2cd8178dd095b2a88d444dc96c315316cadda5f Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Fri, 20 Oct 2017 12:02:21 +0200
Subject: [PATCH 2/5] [travis] export a different PYENV_ROOT

https://travis-ci.org/fonttools/fonttools/jobs/290377841#L506
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8f0df5dd2..4fdc9b6ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ matrix:
         - TOXENV=py27-cov
         - PYENV_VERSION='2.7.6'
         - PYENV_VERSION_STRING='Python 2.7.6'
+        - PYENV_ROOT=$HOME/.travis-pyenv
         - TRAVIS_PYENV_VERSION='0.4.0'
 
 cache:

From f15a0f3b170f2de1f8a698e1762647d96adeeb37 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Fri, 20 Oct 2017 12:12:31 +0200
Subject: [PATCH 3/5] [travis] don't set -e in before_install.sh or else whole
 build mayu fail

https://travis-ci.org/fonttools/fonttools/jobs/290382261
---
 .travis/before_install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index a76939899..71f8128be 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -e
 set -x
 
 if [[ -n "$PYENV_VERSION" ]]; then

From 6fb4153c8d8a57a012a0937a1721b2c0e62d334b Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Fri, 20 Oct 2017 12:19:04 +0200
Subject: [PATCH 4/5] [travis] don't run coverage for python 2.7.6

as it does not change from the other 2.7 build
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4fdc9b6ff..ee8aed8bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
         - TOXENV=py35-cov
         - HOMEBREW_NO_AUTO_UPDATE=1
     - env:
-        - TOXENV=py27-cov
+        - TOXENV=py27-nocov
         - PYENV_VERSION='2.7.6'
         - PYENV_VERSION_STRING='Python 2.7.6'
         - PYENV_ROOT=$HOME/.travis-pyenv

From f3d93bef1b02635dd1f9edf2b1f63685b4014925 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Fri, 20 Oct 2017 12:31:03 +0200
Subject: [PATCH 5/5] [travis] don't set -x either, else Travis log gets too
 verbose

---
 .travis/before_install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 71f8128be..8cc4edba8 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -x
-
 if [[ -n "$PYENV_VERSION" ]]; then
     wget https://github.com/praekeltfoundation/travis-pyenv/releases/download/${TRAVIS_PYENV_VERSION}/setup-pyenv.sh
     source setup-pyenv.sh