Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 85aaa23785ff10337b40d9a5f4316e8a4683668d https://github.com/galaxyproject/galaxy/commit/85aaa23785ff10337b40d9a5f4316... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Make conda install and resolver status more robust We disable the conda resolver if conda_exec is not found and we are unable to install conda. Skip installing conda if it won't be used (because conda exec is outside of conda_prefix). Install conda if conda_prefix is an empty directory. Commit: fdc43a1448453afa1e65ae43f20b71865762882d https://github.com/galaxyproject/galaxy/commit/fdc43a1448453afa1e65ae43f20b7... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M config/galaxy.ini.sample Log Message: ----------- Rephrase conda options and explain conda_prefix, add current length limitation Commit: 0cc10d184dfb949130fefedfe12258241f4982c9 https://github.com/galaxyproject/galaxy/commit/0cc10d184dfb949130fefedfe1225... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Move can_install_conda and is_conda_installed into CondaContext Commit: 30a14e3c392395805453f15d35b9d9c0b76a65ee https://github.com/galaxyproject/galaxy/commit/30a14e3c392395805453f15d35b9d... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Raise a more specific exception Commit: 40f8589c3830af3c4ca69ebcd394d9bf5a53e65b https://github.com/galaxyproject/galaxy/commit/40f8589c3830af3c4ca69ebcd394d... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2789 from mvdbeek/is_conda_installed Make conda install and resolver status more robust Commit: c3c97cef1e1fb9aeb03e2b12e0619172f245b2f0 https://github.com/galaxyproject/galaxy/commit/c3c97cef1e1fb9aeb03e2b12e0619... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M lib/galaxy/tools/toolbox/watcher.py Log Message: ----------- Do not start tool conf watchdog threads until postfork Commit: 59e88fa6f7471e59526c183bc9624f1158ac8160 https://github.com/galaxyproject/galaxy/commit/59e88fa6f7471e59526c183bc9624... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/web/framework/middleware/sentry.py Log Message: ----------- Do not instantiate the raven (sentry) client until uWSGI postfork Commit: c431d8c06cc44dee60d986a230007dff9450a08c https://github.com/galaxyproject/galaxy/commit/c431d8c06cc44dee60d986a230007... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-08-15 (Mon, 15 Aug 2016) Changed paths: M lib/galaxy/config.py Log Message: ----------- Fix import linting error Commit: a13117fdf5708b2060405e414e26f7c114ca0a42 https://github.com/galaxyproject/galaxy/commit/a13117fdf5708b2060405e414e26f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-16 (Tue, 16 Aug 2016) Changed paths: M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/web/framework/middleware/sentry.py Log Message: ----------- Merge pull request #2792 from natefoo/uwsgi-fork-raven [16.07] Do not instantiate the raven (sentry) client or tool conf watchdog threads until uWSGI postfork Commit: 3af38018a57c7e9171e06f589c0200da1a9e8fc3 https://github.com/galaxyproject/galaxy/commit/3af38018a57c7e9171e06f589c020... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-08-16 (Tue, 16 Aug 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/web/framework/middleware/sentry.py Log Message: ----------- Merge branch 'release_16.07' into dev Compare: https://github.com/galaxyproject/galaxy/compare/b62d0073919a...3af38018a57c