From 793b0313f23336d4e913b22c48b673c76408adb5 Mon Sep 17 00:00:00 2001
From: Flaper Fesp <flaper87@gmail.com>
Date: Fri, 6 Sep 2013 16:36:28 +0200
Subject: [PATCH] Update tox.ini and setup.cfg

Change-Id: I14a8fb9b959819001fafbe5550284fcec7dbe78b
---
 setup.cfg | 4 ++++
 tox.ini   | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 011c2619..5bea5c48 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,6 +29,10 @@ setup-hooks =
 packages =
     marconiclient
 
+[nosetests]
+where=tests
+verbosity=2
+
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build
diff --git a/tox.ini b/tox.ini
index 9f72e265..904cbf67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,12 @@
 [tox]
+minversion = 1.6
 envlist = py26,py27,py33,pypy,pep8
+skipsdist = True
 
 [testenv]
+usedevelop = True
+# Customize pip command, add -U to force updates.
+install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
          NOSE_OPENSTACK_COLOR=1