openstack
/
neutron
Code Issues Proposed changes

Sync latest install_venv_common.py with olso 

This patch syncs with oslo change set of
> c78b2ab Avoid using cfg in install_venv_common

So that oslo-config isn't needed to run install_venv

Change-Id: Ia7ee923a53e09c0c6a525294ec4a5dc9d31c3bed
Fixes: bug #1131009
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
This commit is contained in:
Isaku Yamahata 2013-02-21 11:57:59 +09:00
parent 50bfc9a7bd
commit 8501e9d48d
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/install_venv_common.py
View File

@ -21,20 +21,12 @@ virtual environments.
Synced in from openstack-common
"""
import argparse
import os
import subprocess
import sys
possible_topdir = os.getcwd()
if os.path.exists(os.path.join(possible_topdir, "quantum",
"__init__.py")):
sys.path.insert(0, possible_topdir)
from oslo.config import cfg
class InstallVenv(object):
def __init__(self, root, venv, pip_requires, test_requires, py_version,
@ -58,7 +50,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
@ -101,7 +93,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.")
@ -139,17 +131,12 @@ class InstallVenv(object):
def parse_args(self, argv):
"""Parses command-line arguments."""
cli_opts = [
cfg.BoolOpt('no-site-packages',
default=False,
short='n',
help="Do not inherit packages from global Python"
"install"),
]
CLI = cfg.ConfigOpts()
CLI.register_cli_opts(cli_opts)
CLI(argv[1:])
return CLI
parser = argparse.ArgumentParser()
parser.add_argument('-n', '--no-site-packages',
action='store_true',
help="Do not inherit packages from global Python "
"install")
return parser.parse_args(argv[1:])
class Distro(InstallVenv):