Branch: refs/heads/release_17.01 Home: https://github.com/galaxyproject/galaxy Commit: 5ad185590148390ec27750567273f59546eec219 https://github.com/galaxyproject/galaxy/commit/5ad185590148390ec27750567273f... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-30 (Mon, 30 Jan 2017) Changed paths: M test/base/driver_util.py Log Message: ----------- Disable conda_auto_init by default for most tests. Executing framework, API, and/or selenium tests was causing Conda to be installed. This isn't needed - the only tests that test Conda dependencies are unit tests and integration tests that explicitly configure this Conda installation. Commit: a8e59b7b238d123d2407021bd7d62465fbb7d43d https://github.com/galaxyproject/galaxy/commit/a8e59b7b238d123d2407021bd7d62... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-01-30 (Mon, 30 Jan 2017) Changed paths: M test/base/driver_util.py Log Message: ----------- Merge pull request #3517 from jmchilton/disable_testing_conda [17.01] Disable conda_auto_init by default for most tests. Compare: https://github.com/galaxyproject/galaxy/compare/8b08384be3bc...a8e59b7b238d