From 1e8b59e39f6ffd2c9bc5ee3566cffd27914d2266 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 5 Jul 2010 15:55:21 +0200 Subject: [PATCH] updating tox.ini to new format --HG-- branch : trunk --- MANIFEST.in | 1 + tox.ini | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 60cbe6bcb..608230b81 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,6 +9,7 @@ graft contrib graft bin graft testing #exclude *.orig +#exclude *.orig #exclude *.rej #exclude .hginore #exclude *.pyc diff --git a/tox.ini b/tox.ini index 2b0234b65..696ab06a2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,16 @@ +[tox] +distshare={homedir}/.tox/distshare + +[tox:hudson] +distshare={toxworkdir}/distshare + [testenv] -changedir=testing +changedir=testing commands= py.test --confcutdir=.. -rfsxX --junitxml=junit-{envname}.xml --tools-on-path [] -deps=pexpect +deps= + pexpect [testenv:py27] -distribute=True basepython=python2.7 [testenv:py26] basepython=python2.6