Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ec34287afdf63e4712dc76bd29f718a26e04e17e https://github.com/galaxyproject/galaxy/commit/ec34287afdf63e4712dc76bd29f71... Author: John Chilton <jmchilton@gmail.com> Date: 2017-06-08 (Thu, 08 Jun 2017) Changed paths: M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/mulled/mulled_build_files.py M lib/galaxy/tools/deps/mulled/mulled_search.py M lib/galaxy/tools/deps/mulled/util.py Log Message: ----------- Bring in all recent mulled container changes from galaxy-lib. - Update mulled container resolution to use a version 2 (v2) hashing function. https://github.com/galaxyproject/galaxy-lib/pull/63 - When building images with mulled, always cleanup build directory. https://github.com/galaxyproject/galaxy-lib/pull/55/files and https://github.com/galaxyproject/galaxy-lib/pull/61 - Expose an offline search option in library Conda search utility. https://github.com/galaxyproject/galaxy-lib/pull/60 - Fix first use of mulled-build-* for auto-install of Involucro. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/c5e7778f51d735a8... - Fix up and improve logic related to rebuilding mulled containers. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/faf528997c36f8a9... - Fix mulled-build-files to properly handle tab separated files. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/10b1cf3addf03e1e... - Various other mulled-build-file enhancements. https://github.com/galaxyproject/galaxy-lib/pull/59/commits/70314e3e65921a54... https://github.com/galaxyproject/galaxy-lib/pull/59/commits/21b4bc58013dc535... https://github.com/galaxyproject/galaxy-lib/pull/59/commits/74abe8a107044e10... https://github.com/galaxyproject/galaxy-lib/pull/58 - Correct mulled-search default namespace from mulled to biocontainers. https://github.com/galaxyproject/galaxy-lib/pull/57 - Add ability to specify a new base image when building mulled images. https://github.com/galaxyproject/galaxy-lib/pull/56 - Update the default mulled target namespace from the older mulled to the new biocontainers. Commit: 51219f0db0734bfe62a1ba26bf45aca3833541f0 https://github.com/galaxyproject/galaxy/commit/51219f0db0734bfe62a1ba26bf45a... Author: John Chilton <jmchilton@gmail.com> Date: 2017-06-08 (Thu, 08 Jun 2017) Changed paths: A test/functional/tools/mulled_example_multi_versionless.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Add a test tool for mulled containers with versionless requirements. Commit: 065eb716c40b781fe75577c94da3f23bb0b5c4f6 https://github.com/galaxyproject/galaxy/commit/065eb716c40b781fe75577c94da3f... Author: John Chilton <jmchilton@gmail.com> Date: 2017-06-10 (Sat, 10 Jun 2017) Changed paths: M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py Log Message: ----------- Merged downstream galaxy-lib mulled enhancement and fixes. - Singularity support for building mulled containers https://github.com/galaxyproject/galaxy-lib/pull/64 - Hack to fix previous mulled v2 changes for single requirement tools https://github.com/galaxyproject/galaxy-lib/pull/65. Commit: 2178cffaed030bf3e821cd89a299431a63fec7c1 https://github.com/galaxyproject/galaxy/commit/2178cffaed030bf3e821cd89a2994... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-12 (Mon, 12 Jun 2017) Changed paths: M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/mulled/mulled_build_files.py M lib/galaxy/tools/deps/mulled/mulled_search.py M lib/galaxy/tools/deps/mulled/util.py A test/functional/tools/mulled_example_multi_versionless.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #4173 from jmchilton/galaxy-lib-mulled-update Improved Mulled Containers Compare: https://github.com/galaxyproject/galaxy/compare/3bff7f36d1a9...2178cffaed03