summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-07-31 12:13:20 -0400
committerMonty Taylor <mordred@inaugust.com>2013-07-31 12:13:20 -0400
commit1b076edd7ae17d95f8b2c0749bd387a6ee6fcafa (patch)
treec07efffdfcad3e6d57e7a429cf43742f709ff2d6 /tools
parentf58c936582a17cffcdcdb5bf624f24d574abaf0a (diff)
downloadoslo-1b076edd7ae17d95f8b2c0749bd387a6ee6fcafa.tar.gz
oslo-1b076edd7ae17d95f8b2c0749bd387a6ee6fcafa.tar.xz
oslo-1b076edd7ae17d95f8b2c0749bd387a6ee6fcafa.zip
Ensure install_venv works behind firewalls
There is a problem with setuptools and firewalls that prevents setuptools from downloading setup_requires properly. The only thing in openstack that really needs setup_requires is pbr. Once that's in, everything else installs via pip, which does firewalls correctly. So, just install the latest pbr into the venv and the rest should work. Change-Id: I838559f6f308e4a0c255af7bc27cdc669c5cf5f3
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv_common.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index f428c1e..6ce5d00 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -114,9 +114,10 @@ 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)