Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d48817adb17b914975c26b90a2dd17887b24744b https://github.com/galaxyproject/galaxy/commit/d48817adb17b914975c26b90a2dd1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M run.sh Log Message: ----------- Remove redundant .venv activation -- this is handled in common_startup Commit: 72d360e942da2a614b7d74d3238d2ee0791a8141 https://github.com/galaxyproject/galaxy/commit/72d360e942da2a614b7d74d3238d2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- Change startup logic for .venv sourcing. If a .venv exists, use it. If not, if conda is there, use it. If no conda, create a .venv. Commit: 7f5d9d2fbd745f2099be15de706112717f9e01f6 https://github.com/galaxyproject/galaxy/commit/7f5d9d2fbd745f2099be15de70611... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- More startup logic tweaks, .venv > conda > new_venv Commit: 985bd0dffd779b55813f6dc1c6bae663e959bd9c https://github.com/galaxyproject/galaxy/commit/985bd0dffd779b55813f6dc1c6bae... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M run.sh Log Message: ----------- Because common_startup is executed and not sourced, this block needs to remain in run.sh Commit: 31b73fd5869f1c3ae968fb29773cf1631a3f5843 https://github.com/galaxyproject/galaxy/commit/31b73fd5869f1c3ae968fb29773cf... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- Merge pull request #3180 from dannon/venv_over_conda Prefer existing .venv over conda, when both are available. Compare: https://github.com/galaxyproject/galaxy/compare/0b8fc7c8cca4...31b73fd5869f