From 426f8d68b15dacf134881b8276b564b803c35bd8 Mon Sep 17 00:00:00 2001
From: Eric Soroos <eric@soroos.net>
Date: Fri, 20 Jan 2017 11:34:13 -0800
Subject: [PATCH] reenable nightly, move diffcover to non-docker 2.7 build

---
 .travis.yml              |  3 ++-
 .travis/after_success.sh | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2259fd5ea..34f37b611 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ notifications:
 # Then run the remainder.
 
 matrix:
-  fast_finish: false
+  fast_finish: true
   allow_failures:
     - python: nightly
   include:
@@ -24,6 +24,7 @@ matrix:
     - python: '3.5'
     - python: '3.4'
     - python: '3.3'
+    - python: 'nightly'
   
 dist: trusty
 
diff --git a/.travis/after_success.sh b/.travis/after_success.sh
index 64f35c9c9..415224f48 100755
--- a/.travis/after_success.sh
+++ b/.travis/after_success.sh
@@ -13,19 +13,19 @@ coverage report
 pip install coveralls-merge
 coveralls-merge coverage.c.json
 
-if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then
+if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ] && [ "$DOCKER" == "" ]; then
 	pip install pep8 pyflakes
 	pep8 --statistics --count PIL/*.py
 	pep8 --statistics --count Tests/*.py
 	pyflakes *.py       | tee >(wc -l)
 	pyflakes PIL/*.py   | tee >(wc -l)
 	pyflakes Tests/*.py | tee >(wc -l)
-fi
 
-# Coverage and quality reports on just the latest diff.
-# (Installation is very slow on Py3, so just do it for Py2.)
-if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-install.sh; fi
-if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-run.sh; fi
+	# Coverage and quality reports on just the latest diff.
+	# (Installation is very slow on Py3, so just do it for Py2.)
+	depends/diffcover-install.sh
+	depends/diffcover-run.sh
+fi
 
 # after_all