1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1eedbc8a3a8d/ Changeset: 1eedbc8a3a8d User: dannon Date: 2014-09-04 22:25:37 Summary: Merged in lance_parsons/galaxy-central-pull-requests/venv (pull request #486) Source virtualenv prior to python check and source venv for reports webapp Affected #: 2 files diff -r 9b6cccb3af2d6b13a1a1da7def87dcc19172be88 -r 1eedbc8a3a8d6abcb8da2a7db246cb4f924b763f run.sh --- a/run.sh +++ b/run.sh @@ -2,6 +2,13 @@ cd `dirname $0` +# 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 + python ./scripts/check_python.py [ $? -ne 0 ] && exit 1 @@ -11,13 +18,6 @@ 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` diff -r 9b6cccb3af2d6b13a1a1da7def87dcc19172be88 -r 1eedbc8a3a8d6abcb8da2a7db246cb4f924b763f run_reports.sh --- a/run_reports.sh +++ b/run_reports.sh @@ -11,6 +11,13 @@ cd `dirname $0` +# 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 + ./scripts/common_startup.sh --skip-samples GALAXY_REPORTS_CONFIG=${GALAXY_REPORTS_CONFIG:-reports_wsgi.ini} 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.