From 6539eacb7d07c99a1e560ccc2442ebbd21c06db0 Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Fri, 19 Dec 2014 14:37:45 -0600 Subject: [PATCH] Sync install_venv_common from oslo-incubator The install_venv_common modules hasn't had a sync done since early in the icehouse release. This sync brings Cinder's version up to date with the latest code. Current HEAD in OSLO: --------------------- commit 36b0e8570b449129d6d474c03b02ceb62edb78df Date: Thu Dec 11 11:27:08 2014 +0100 We shouldn't replace `oslo-incubator` in comments Change being merged with this patch: --------------------- fe3389e5 - Improve help strings Change-Id: I66fd66650a7106b8d20e4fc483dabb91184922f9 --- tools/install_venv_common.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 3e8c1e4a81f..e279159abbc 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -112,12 +112,12 @@ class InstallVenv(object): print('Installing dependencies with pip (this can take a while)...') # First things first, make sure our venv has the latest pip and - # setuptools. - self.pip_install('pip>=1.3') + # setuptools and pbr + self.pip_install('pip>=1.4') self.pip_install('setuptools') + self.pip_install('pbr') - self.pip_install('-r', self.requirements) - self.pip_install('-r', self.test_requirements) + self.pip_install('-r', self.requirements, '-r', self.test_requirements) def parse_args(self, argv): """Parses command-line arguments.""" @@ -125,7 +125,7 @@ class InstallVenv(object): parser.add_option('-n', '--no-site-packages', action='store_true', help="Do not inherit packages from global Python " - "install") + "install.") return parser.parse_args(argv[1:])[0]