From de723d969e43512a76c98015324c65d1fd6c72ae Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Wed, 11 Dec 2013 09:30:46 -0800
Subject: [PATCH] Have tox install via setup.py develop

tox 1.6 was released, which means that we can now take advantage of
the feature we added to it - which is using setup.py develop to
install the code into the virtualenv. The logic was taken from
run_tests.sh - so the performance issues around using tox vs. using
install_venv should now be gone.

Additionally, override the tox pip install command to avoid using the
"--pre" option which is the default in tox.  "--pre" means "Include
pre-release and development versions."  By default, pip will only
install stable versions of software, and that is the behavior we want.

Change-Id: Ida5e440d1bdb9f8e9031277ea53a02d2ef171438
Co-Authored-By: Monty Taylor <mordred@inaugust.com>
---
 AUTHORS | 1 +
 tox.ini | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 190e9d4d..d7a2a8e9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,7 @@ Alexander Kuznetsov <akuznetsov@mirantis.com>
 Andrew Lazarev <alazarev@mirantis.com>
 Chad Roberts <croberts@redhat.com>
 Dmitry Mescheryakov <dmescheryakov@mirantis.com>
+James E. Blair <jeblair@openstack.org>
 Jeremy Stanley <fungi@yuggoth.org>
 Matthew Farrellee <matt@redhat.com>
 Nadya Privalova <nprivalova@mirantis.com>
diff --git a/tox.ini b/tox.ini
index 01da6bb6..ddfc60c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
+minversion = 1.6
+skipsdist = True
 envlist = py26,py27,pep8
 
 [testenv]
+usedevelop = True
+install_command = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     NOSE_WITH_OPENSTACK=1