Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 49a001cf7c4bbca1dd866a0a97082d343b3ea349 https://github.com/galaxyproject/galaxy/commit/49a001cf7c4bbca1dd866a0a97082... Author: John Chilton jmchilton@gmail.com Date: 2018-02-28 (Wed, 28 Feb 2018)

Changed paths: M lib/galaxy/tools/deps/conda_util.py

Log Message: ----------- Conda fixes for 18.01 - stdout redirection.

Broken in #5397 I think.

Commit: 79a5acaaec6d4b6e4ee36998977d85a8dc769612 https://github.com/galaxyproject/galaxy/commit/79a5acaaec6d4b6e4ee36998977d8... Author: John Chilton jmchilton@gmail.com Date: 2018-02-28 (Wed, 28 Feb 2018)

Changed paths: M lib/galaxy/tools/cwl/util.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/verify/test_data.py

Log Message: ----------- Conda fixes for dev - mostly Python 3.

Commit: 0dbbfc7afcbde64a068c0bb321184b219b8c51af https://github.com/galaxyproject/galaxy/commit/0dbbfc7afcbde64a068c0bb321184... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-02-28 (Wed, 28 Feb 2018)

Changed paths: M lib/galaxy/tools/cwl/util.py M lib/galaxy/tools/verify/test_data.py

Log Message: ----------- Prettier imports

Commit: 77537ad55398b004cf0c4de3e7aaa11ce15a7a60 https://github.com/galaxyproject/galaxy/commit/77537ad55398b004cf0c4de3e7aaa... Author: John Chilton jmchilton@gmail.com Date: 2018-02-28 (Wed, 28 Feb 2018)

Changed paths: M lib/galaxy/tools/cwl/util.py

Log Message: ----------- Tweak to Python 3 fix as suggested by @nsoranzo.

Commit: cbade98a233db9f7a4c8ae28ccff2bc1258d5802 https://github.com/galaxyproject/galaxy/commit/cbade98a233db9f7a4c8ae28ccff2... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2018-02-28 (Wed, 28 Feb 2018)

Changed paths: M lib/galaxy/tools/cwl/util.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/verify/test_data.py

Log Message: ----------- Merge pull request #5621 from jmchilton/galaxy_lib_update

Fixes from galaxy-lib

Compare: https://github.com/galaxyproject/galaxy/compare/4caaa70006ce...cbade98a233d