bootstrap: enable system site packages, force install of nose

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/bootstrap b/bootstrap
index 907596c25da71fde08190e126e6cf4bba6f86146..c845f0f0f17e82868c0058074f56af6e0e48e9b4 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -25,16 +25,17 @@ if [ -f /etc/redhat-release ]; then
     fi
 fi
 
-virtualenv --no-site-packages --distribute virtualenv
+virtualenv --system-site-packages --distribute virtualenv
 
 # avoid pip bugs
 ./virtualenv/bin/pip install --upgrade pip
 
 # work-around change in pip 1.5
 ./virtualenv/bin/pip install six
+./virtualenv/bin/pip install -I nose
 ./virtualenv/bin/pip install setuptools --no-use-wheel --upgrade
 
-./virtualenv/bin/pip install -r requirements.txt
+./virtualenv/bin/pip install -U -r requirements.txt
 
 # forbid setuptools from using the network because it'll try to use
 # easy_install, and we really wanted pip; next line will fail if pip