From 41d3c386a983f3ea716c4a06f83a919485d22615 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Wed, 14 May 2014 08:17:49 +0300
Subject: [PATCH 1/2] Don't cover PyPy: it fails intermittently and is x5.8
 slower (#640)

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ae6e415c..96c10d0ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,12 @@ notifications:
   irc: "chat.freenode.net#pil"
 
 python:
-  - "pypy"
   - 2.6
   - 2.7
   - 3.2
   - 3.3
   - 3.4
+  - "pypy"
 
 install:
   - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev cmake"
@@ -26,8 +26,14 @@ script:
   - coverage erase
   - python setup.py clean
   - python setup.py build_ext --inplace
-  - coverage run --append --include=PIL/* selftest.py
-  - python Tests/run.py --coverage
+
+    # Don't cover PyPy: it fails intermittently and is x5.8 slower (#640)
+  - if [ "$TRAVIS_PYTHON_VERSION" == "pypy" ]; then python selftest.py; fi
+  - if [ "$TRAVIS_PYTHON_VERSION" == "pypy" ]; then python Tests/run.py; fi
+
+    # Cover the others
+  - if [ "$TRAVIS_PYTHON_VERSION" != "pypy" ]; then coverage run --append --include=PIL/* selftest.py; fi
+  - if [ "$TRAVIS_PYTHON_VERSION" != "pypy" ]; then python Tests/run.py --coverage; fi
 
 after_success:
   - coverage report
@@ -37,7 +43,3 @@ after_success:
   - pyflakes PIL/*.py
   - pep8 Tests/*.py
   - pyflakes Tests/*.py
-
-matrix:
-  allow_failures:
-    - python: "pypy"

From 6ca9e9d70383a5be60a69387f99bb08b6847e280 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Wed, 14 May 2014 08:47:13 +0300
Subject: [PATCH 2/2] Keep PyPy first, it's still a little slower

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 96c10d0ae..36dae5b7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,12 @@ notifications:
   irc: "chat.freenode.net#pil"
 
 python:
+  - "pypy"
   - 2.6
   - 2.7
   - 3.2
   - 3.3
   - 3.4
-  - "pypy"
 
 install:
   - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev cmake"