tMerge pull request #1334 from romanz/master - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 306756b42dcdfc1fdf9092274d819bc709d504d4 DIR parent ff46d6b7d4368f61bb7832ae504a79ca817483f4 HTML Author: ThomasV <electrumdev@gmail.com> Date: Thu, 2 Jul 2015 16:55:25 +0200 Merge pull request #1334 from romanz/master ttravis: use Tox for test automation Diffstat: M .gitignore | 1 + M .travis.yml | 6 ++---- A tox.ini | 10 ++++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) --- DIR diff --git a/.gitignore b/.gitignore t@@ -15,3 +15,4 @@ locale/ *_trial_temp packages env/ +.tox/ DIR diff --git a/.travis.yml b/.travis.yml t@@ -3,8 +3,6 @@ language: python python: - "2.7" install: - - "pip install ." - - "pip install coverage" + - pip install tox script: - - "coverage run --source=lib -m py.test -v" - - "coverage report" + - tox DIR diff --git a/tox.ini b/tox.ini t@@ -0,0 +1,10 @@ +[tox] +envlist = py27 + +[testenv] +deps= + pytest + coverage +commands= + coverage run --source=lib -m py.test -v + coverage report