Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9f8c29520df53ca42e241d69718ddd2e1d37a987 https://github.com/galaxyproject/galaxy/commit/9f8c29520df53ca42e241d69718dd... Author: mvdbeek m.vandenbeek@gmail.com Date: 2018-11-07 (Wed, 07 Nov 2018)

Changed paths: M doc/source/admin/framework_dependencies.rst M scripts/common_startup.sh

Log Message: ----------- Use virtualenv when conda is on PATH

This uses our proper pinned requirements and is sginificantly easier to set up and maintain.

Commit: 3ed0ce862bf9397aefa3b3d58552e2013fcd098c https://github.com/galaxyproject/galaxy/commit/3ed0ce862bf9397aefa3b3d58552e... Author: Dannon dannon.baker@gmail.com Date: 2018-11-09 (Fri, 09 Nov 2018)

Changed paths: M doc/source/admin/framework_dependencies.rst M scripts/common_startup.sh

Log Message: ----------- Merge pull request #6975 from mvdbeek/conda_run_sh

Use virtualenv when conda is on PATH

Compare: https://github.com/galaxyproject/galaxy/compare/5f2c785d66f7...3ed0ce862bf9 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.