1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/bde270ca78de/ Changeset: bde270ca78de User: natefoo Date: 2014-07-11 15:58:08 Summary: Automatically use a virtualenv in galaxy_root/.venv/ if it exists (a la Pulsar). Affected #: 2 files diff -r 82a80300b9a101072ea614de5424ec76ebae9340 -r bde270ca78de3a6c380250e8f594c31a4a4ce73c .hgignore --- a/.hgignore +++ b/.hgignore @@ -11,6 +11,9 @@ scripts/scramble/lib scripts/scramble/archives +# Python virtualenv +.venv + # Database stuff database/beaker_sessions database/community_files diff -r 82a80300b9a101072ea614de5424ec76ebae9340 -r bde270ca78de3a6c380250e8f594c31a4a4ce73c run.sh --- a/run.sh +++ b/run.sh @@ -11,6 +11,13 @@ python ./scripts/build_universe_config.py "$GALAXY_UNIVERSE_CONFIG_DIR" fi +# If there is a .venv/ directory, assume it contains a virtualenv that we +# should run this instance in. +if [ -d .venv ]; +then + . .venv/bin/activate +fi + if [ -n "$GALAXY_RUN_ALL" ]; then servers=`sed -n 's/^\[server:\(.*\)\]/\1/ p' universe_wsgi.ini | xargs echo` daemon=`echo "$@" | grep -q daemon` Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.