From 09199631197bff05d91d77ccb02e17b79d44ecbb Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Tue, 31 Jul 2012 16:07:00 -0400
Subject: [PATCH] adding option back for --system-site-packages, will ensure
virtualenv > 1.7
---
create-dev-env.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/create-dev-env.sh b/create-dev-env.sh
index a5da1397899..e3f67653e6e 100755
--- a/create-dev-env.sh
+++ b/create-dev-env.sh
@@ -38,7 +38,7 @@ usage() {
Usage: $PROG [-c] [-v] [-h]
-c compile scipy and numpy
- -s do _not_ set --no-site-packages for virtualenv
+ -s give access to global site-packages for virtualenv
-v set -x + spew
-h this
@@ -229,7 +229,7 @@ case `uname -s` in
}
command -v virtualenv &>/dev/null || {
output "Installing virtualenv"
- sudo pip install virtualenv virtualenvwrapper
+ sudo pip install 'virtualenv>1.7' virtualenvwrapper
}
command -v coffee &>/dev/null || {
output "Installing coffee script"
@@ -248,10 +248,12 @@ curl -sL get.rvm.io | bash -s stable
source $RUBY_DIR/scripts/rvm
# skip the intro
LESS="-E" rvm install $RUBY_VER
-if [[ -n $systempkgs ]]; then
- virtualenv "$PYTHON_DIR"
+if [[ $systempkgs ]]; then
+ virtualenv --system-site-packages "$PYTHON_DIR"
else
- virtualenv --no-site-packages "$PYTHON_DIR"
+ # default behavior for virtualenv>1.7 is
+ # --no-site-packages
+ virtualenv "$PYTHON_DIR"
fi
source $PYTHON_DIR/bin/activate
output "Installing gem bundler"
--
GitLab