From 2aec7f16f9b541673f8114d2402c24a35965d536 Mon Sep 17 00:00:00 2001 From: John Tran Date: Tue, 30 Oct 2012 23:39:00 +0000 Subject: [PATCH] set tox to ignore global packages Ran into problems with Ming and stevedore which tox will look at the global installed pkg instead of the virtualenv pkg Change-Id: Ie1a834dce51fc916f1f3c3c1abd95d080ff1c9cd --- tools/pip-requires | 3 ++- tox.ini | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/pip-requires b/tools/pip-requires index da8a6c49..0581f6f1 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -4,7 +4,8 @@ iso8601 lockfile netaddr argparse -sqlalchemy +SQLAlchemy==0.7.8 +sqlalchemy-migrate>=0.7.2 eventlet anyjson>=0.3.1 Flask==0.9 diff --git a/tox.ini b/tox.ini index 437eb05b..b99ac6aa 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_SHOW_ELAPSED=1 commands = {toxinidir}/run_tests.sh --no-path-adjustment [] -sitepackages = True +sitepackages = False [testenv:livedb] setenv=CEILOMETER_TEST_LIVE=1