Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8261a2398a7981e77be056bae0e3c15f3a097a85 https://github.com/galaxyproject/galaxy/commit/8261a2398a7981e77be056bae0e3c... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-04 (Wed, 04 Apr 2018) Changed paths: M create_db.sh M doc/source/admin/framework_dependencies.rst M extract_dataset_parts.sh M manage_db.sh M run_tests.sh M scripts/common_startup.sh M scripts/common_startup_functions.sh Log Message: ----------- Make the startup scripts play just as nicely with Conda as they do with virtualenv. Commit: a88e19064a38415d867f4c118dd6938d8e368632 https://github.com/galaxyproject/galaxy/commit/a88e19064a38415d867f4c118dd69... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-04 (Wed, 04 Apr 2018) Changed paths: M config/galaxy.yml.sample M scripts/get_uwsgi_args.py Log Message: ----------- Don't set uWSGI's virtualenv option when running from Conda Commit: b3eff87a1ba0ec0f07c69045f2b279cab8476a7b https://github.com/galaxyproject/galaxy/commit/b3eff87a1ba0ec0f07c69045f2b27... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-04 (Wed, 04 Apr 2018) Changed paths: M lib/galaxy/dependencies/conda-file.sh M scripts/common_startup.sh M scripts/common_startup_functions.sh Log Message: ----------- Clean up and useability enhancements Commit: c5262e8971679bd431cb0238391f0ec7d5ba087e https://github.com/galaxyproject/galaxy/commit/c5262e8971679bd431cb0238391f0... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-04 (Wed, 04 Apr 2018) Changed paths: M scripts/common_startup.sh Log Message: ----------- Look for both `base` and `root` conda envs Commit: 2829a1f1646b2ba85faf986b56799daccafb1060 https://github.com/galaxyproject/galaxy/commit/2829a1f1646b2ba85faf986b56799... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-18 (Wed, 18 Apr 2018) Changed paths: M config/galaxy.yml.sample M create_db.sh M doc/source/admin/framework_dependencies.rst M extract_dataset_parts.sh M lib/galaxy/dependencies/conda-file.sh M manage_db.sh M run_tests.sh M scripts/common_startup.sh M scripts/common_startup_functions.sh M scripts/get_uwsgi_args.py Log Message: ----------- Merge pull request #5854 from natefoo/run-scripts-conda Improve startup interoperability with Conda Compare: https://github.com/galaxyproject/galaxy/compare/65d4aff437d0...2829a1f1646b