Hopefully fixing travis-ci problems. Modeled after PR #945

.travis.yml

@@ -8,21 +8,18 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "nightly"
   - "pypy"
   - "pypy3"
 
 install:
   - travis_retry bash test/travis_setup.sh
-  # Coveralls 4.0 doesn't support Python 3.2
-  - if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi
-  - if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi
-  - pip install -U coverage coveralls
 
 script:
- - python -m coverage run --source=bottle.py test/testall.py fast
- - python -m coverage combine
- - python -m coverage report 2>&1
+  - python -m coverage run --source=. test/testall.py fast
+  - python -m coverage combine
+  - python -m coverage report 2>&1
 
 notifications:
   irc: "irc.freenode.org#bottlepy"

test/travis_setup.sh

@@ -1,14 +1,23 @@
-#!/bin/bash
 
-set -e
-set -x
+# This script is run by travis-ci prior to running tests.
 
-sudo apt-get install libev-dev
+# Coverage 4.0 doesn't support Python 3.2
+if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then
+    pip install coverage==3.7.1
+else
+    pip install -U coverage
+fi
+
+pip install coveralls
 
+# Server back-ends and template engines. Not all back-ends support all python versions and we only want to test for 2.7 and 3.6 to keep things sane
 if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
-    pip install flup waitress cherrypy paste fapws3 tornado twisted diesel meinheld gunicorn eventlet gevent rocket bjoern
+    sudo apt-get install libev-dev
+    pip install mako jinja2 waitress "cherrypy<9" cheroot paste tornado twisted diesel meinheld gunicorn eventlet
+    pip install flup fapws3 rocket bjoern gevent
+elif  [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then
+    sudo apt-get install libev-dev
+    pip install mako jinja2 waitress "cherrypy<9" cheroot paste tornado twisted diesel meinheld gunicorn eventlet
+    pip install uvloop
 fi
 
-if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then
-    pip install waitress cherrypy paste tornado twisted diesel meinheld gunicorn eventlet gevent uvloop
-fi