Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: cb43b6b5316d76a1043409e95607a4a3b4aa7aa1 https://github.com/galaxyproject/galaxy/commit/cb43b6b5316d76a1043409e95607a... Author: John Chilton jmchilton@gmail.com Date: 2018-03-07 (Wed, 07 Mar 2018)

Changed paths: M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/verify/asserts/__init__.py M lib/galaxy/util/path/__init__.py

Log Message: ----------- Bring in the latest galaxy-lib updates.

These fixes include:

- Python 3 fix for assertion testing code (https://github.com/galaxyproject/galaxy-lib/pull/101). - Mulled enhancement to escape quotes in test code for mulled images - https://github.com/galaxyproject/galaxy-lib/pull/100. - Mulled enhancement to make CONDA_IMAGE configurable - https://github.com/galaxyproject/galaxy-lib/pull/99. - Fix galaxy.util.path for import on Windows (https://github.com/galaxyproject/galaxy-lib/pull/98).

Commit: 6675959069b0b5cb776f3194cd24c2b9a97f59c4 https://github.com/galaxyproject/galaxy/commit/6675959069b0b5cb776f3194cd24c... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2018-03-07 (Wed, 07 Mar 2018)

Changed paths: M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/verify/asserts/__init__.py M lib/galaxy/util/path/__init__.py

Log Message: ----------- Merge pull request #5653 from jmchilton/galaxy-lib-update-20180307

Bring in the latest galaxy-lib updates.

Compare: https://github.com/galaxyproject/galaxy/compare/3afb4abad3a3...6675959069b0