Fix failing builds

.travis.yml

@@ -1,5 +1,27 @@
+os: linux
 language: python
+sudo: false # faster builds
 
-before_install: pip install tox
+matrix:
+  include:
+    - python: 3.6
+      env: TOXENV=py,devel 
+    - python: 3.5
+      env: TOXENV=py,devel
+    - python: 3.4
+      env: TOXENV=py,devel
+    - python: 2.7
+      env: TOXENV=py,devel
 
-script: tox
+install:
+  - pip install tox
+
+script:
+  - tox
+
+branches:
+  only:
+    - master
+
+notifications:
+  email: false

tox.ini

@@ -1,22 +1,10 @@
 [tox]
-envlist = py27-bottledev,py27-bottle012,py27-bottle011,py27-bottle010,py27-bottle09,py26,py27,py32,py33,pypy
+envlist = 
+    py{36,35,34,27,py}
+    py{36,27}-devel
 
 [testenv]
-deps=bottle
+deps =
-commands={envpython} test.py
+    bottle
-sitepackages=False
 
-[testenv:py27-bottle09]
+    devel: https://github.com/bottlepy/bottle/archive/master.zip
-deps=bottle>=0.9,<0.10
-
-[testenv:py27-bottle010]
-deps=bottle>=0.10,<0.11
-
-[testenv:py27-bottle011]
-deps=bottle>=0.11,<0.12
-
-[testenv:py27-bottle012]
-deps=bottle>=0.12,<0.13
-
-[testenv:py27-bottledev]
-deps=git+https://github.com/defnull/bottle.git#egg=bottle