From 07e47e1593cddbe905123615009ceeb37a580a93 Mon Sep 17 00:00:00 2001 From: vponomaryov Date: Tue, 25 Mar 2014 12:11:07 +0200 Subject: [PATCH] Fix venv installation for run_tests.sh Change-Id: I24810421f82da3d9d0ba6600b98955f28569a6a8 Closes-bug: 1261518 --- tools/install_venv_common.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index a06575bca2..b2ee319a56 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -109,22 +109,9 @@ class InstallVenv(object): def install_dependencies(self): print 'Installing dependencies with pip (this can take a while)...' - - # First things first, make sure our venv has the latest pip and - # distribute. - # NOTE: we keep pip at version 1.1 since the most recent version causes - # the .venv creation to fail. See: - # https://bugs.launchpad.net/nova/+bug/1047120 - self.pip_install('pip==1.1') - self.pip_install('distribute') - - # Install greenlet by hand - just listing it in the requires file does - # not - # get it installed in the right order - self.pip_install('greenlet') - - self.pip_install('-r', self.pip_requires) - self.pip_install('-r', self.test_requires) + self.pip_install('pip>=1.3') + self.pip_install('setuptools') + self.pip_install('-r', self.pip_requires, '-r', self.test_requires) def parse_args(self, argv): """Parses command-line arguments."""