diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-20 00:37:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-20 00:37:40 +0000 |
| commit | 3f3fb4bef78b434a80b31755c51afddcaaa21a22 (patch) | |
| tree | 207514f3968cee47c2897bff80989b10fec2089c | |
| parent | bc561938647cfa5f2f24a6e5a0e2e929bfcae712 (diff) | |
| parent | c78b2ab9355e1ed6953262daf98e9aefe3c99c79 (diff) | |
| download | oslo-3f3fb4bef78b434a80b31755c51afddcaaa21a22.tar.gz oslo-3f3fb4bef78b434a80b31755c51afddcaaa21a22.tar.xz oslo-3f3fb4bef78b434a80b31755c51afddcaaa21a22.zip | |
Merge "Avoid using cfg in install_venv_common"
| -rw-r--r-- | tools/install_venv_common.py | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 7cb3968..fd9076f 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -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, "oslo", - "__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, @@ -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): |