diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv_common.py | 13 | ||||
| -rw-r--r-- | tools/pip-requires | 2 | ||||
| -rw-r--r-- | tools/test-requires | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 155db3b..7cb3968 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -25,7 +25,14 @@ import os import subprocess import sys -from openstack.common import cfg + +possible_topdir = os.getcwd() +if os.path.exists(os.path.join(possible_topdir, "oslo", + "__init__.py")): + sys.path.insert(0, possible_topdir) + + +from oslo.config import cfg class InstallVenv(object): @@ -51,7 +58,7 @@ class InstallVenv(object): check_exit_code=True): """Runs a command in an out-of-process shell. - Returns the output of that command. Working directory is ROOT. + Returns the output of that command. Working directory is self.root. """ if redirect_output: stdout = subprocess.PIPE @@ -94,7 +101,7 @@ class InstallVenv(object): else: self.run_command(['virtualenv', '-q', self.venv]) print 'done.' - print 'Installing pip in virtualenv...', + print 'Installing pip in venv...', if not self.run_command(['tools/with_venv.sh', 'easy_install', 'pip>1.0']).strip(): self.die("Failed to install pip.") diff --git a/tools/pip-requires b/tools/pip-requires index f5f888f..9876a14 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -9,3 +9,5 @@ anyjson==0.2.4 kombu==1.0.4 argparse stevedore +SQLAlchemy>=0.7.8,<=0.7.9 +http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config diff --git a/tools/test-requires b/tools/test-requires index 393b72a..3c26a47 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -5,12 +5,14 @@ coverage fixtures>=0.3.12 mock mox==0.5.3 +mysql-python nose nose-exclude nosexcover openstack.nose_plugin nosehtmloutput pep8==1.3.3 +pyflakes pylint pyzmq>=2.1.11 setuptools-git>=0.4 |