From 0551e4e3a55d91fd52db495741005f3419c55cbb Mon Sep 17 00:00:00 2001 From: Alen Mistric Date: Sun, 16 Sep 2018 05:51:58 +0200 Subject: [PATCH] Fix failed builds --- .travis.yml | 26 ++++++++++++++++++++++++-- tox.ini | 24 ++++++------------------ 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index d21c7e4..20763ee 100644 --- a/.travis.yml +++ b/.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 diff --git a/tox.ini b/tox.ini index d5a8b53..f334d05 100644 --- a/tox.ini +++ b/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 -commands={envpython} test.py -sitepackages=False +deps = + bottle -[testenv:py27-bottle09] -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 + devel: https://github.com/bottlepy/bottle/archive/master.zip