Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 89278b0ec70b7a8f1cf42bda87335cf4f98f175b https://github.com/galaxyproject/galaxy/commit/89278b0ec70b7a8f1cf42bda87335... Author: John Chilton <jmchilton@gmail.com> Date: 2016-10-07 (Fri, 07 Oct 2016) Changed paths: M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Fix for bioconda recipes depending on conda-forge. Some bioconda recipes now depend on conda forge, this fix is needed for them to work properly. Commit: ddacf38a11a9f752b3cfe13a8b63182ff1d02d06 https://github.com/galaxyproject/galaxy/commit/ddacf38a11a9f752b3cfe13a8b631... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #3023 from jmchilton/fix_abyss [16.07] Fix for bioconda recipes depending on conda-forge. Commit: 39fb030f13c45991d4a2ca811b66e7872fb0a4e7 https://github.com/galaxyproject/galaxy/commit/39fb030f13c45991d4a2ca811b66e... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M .travis.yml Log Message: ----------- Remove travis-ci python installation, since python2.7 is preinstalled on OSX images now Commit: 2adb98e58cc0f1d0d25aecc260d7108902d4b02c https://github.com/galaxyproject/galaxy/commit/2adb98e58cc0f1d0d25aecc260d71... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M .travis.yml Log Message: ----------- Merge pull request #3034 from mvdbeek/skip_python_install_travis [16.04] Remove travis-ci python installation, since python2.7 is preinstalled… Commit: 3300a73c9db6b99cbec6ae952e3e59f8a72e651b https://github.com/galaxyproject/galaxy/commit/3300a73c9db6b99cbec6ae952e3e5... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M .travis.yml Log Message: ----------- Merge branch 'release_16.04' into release_16.07 Commit: 1156006733001fb06520a70f54a9227f5b4c7061 https://github.com/galaxyproject/galaxy/commit/1156006733001fb06520a70f54a92... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M .travis.yml M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst Log Message: ----------- Merge branch 'release_16.07' into dev Conflicts: lib/galaxy/tools/deps/__init__.py Compare: https://github.com/galaxyproject/galaxy/compare/6639a181df3b...115600673300