From 7492002cf7e9b19602bda622d62347f849280cd5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 30 Sep 2013 18:57:43 -0400 Subject: [PATCH] usedevelop in tox We want to run code inside of the venv, not outside. Change-Id: I92c5e35674933ac4d9d15eda32f3b9339dbedbd3 --- tox.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 0ed6211bb..11df1a3c8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,15 @@ [tox] +minversion = 1.6 +skipsdist = True envlist = py26,py27,py33,pep8 [testenv] -sitepackages = False setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=C +usedevelop = True +install_command = pip install {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -16,11 +19,9 @@ commands = {toxinidir}/tools/conf/check_uptodate.sh [tox:jenkins] -sitepackages = True downloadcache = ~/cache/pip [testenv:pep8] -sitepackages = False commands = flake8 {posargs} . cinder/common flake8 --filename=cinder* bin -- 2.45.2