Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 630ac3658f3c64bd9a9abe5757cce0ed01cad229 https://github.com/galaxyproject/galaxy/commit/630ac3658f3c64bd9a9abe5757cce... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-22 (Tue, 22 Dec 2015) Changed paths: M lib/galaxy/exceptions/error_codes.py M lib/galaxy/tools/deps/commands.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/lint.py M lib/galaxy/tools/linters/inputs.py M lib/galaxy/tools/linters/stdio.py M lib/galaxy/tools/parser/output_objects.py M lib/galaxy/tools/parser/yaml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/panel.py M lib/galaxy/util/__init__.py M lib/galaxy/util/heartbeat.py M lib/galaxy/util/json.py M lib/galaxy/util/xml_macros.py Log Message: ----------- Python 3 fixes and galaxy-lib updates from planemo. (Minus changes for conda which - should be merged as their own PR obviously.) Commit: ded904cb12580723b192fe571cf2a4f20ec16619 https://github.com/galaxyproject/galaxy/commit/ded904cb12580723b192fe571cf2a... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-12-23 (Wed, 23 Dec 2015) Changed paths: M lib/galaxy/exceptions/error_codes.py M lib/galaxy/tools/deps/commands.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/lint.py M lib/galaxy/tools/linters/inputs.py M lib/galaxy/tools/linters/stdio.py M lib/galaxy/tools/parser/output_objects.py M lib/galaxy/tools/parser/yaml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/panel.py M lib/galaxy/util/__init__.py M lib/galaxy/util/heartbeat.py M lib/galaxy/util/json.py M lib/galaxy/util/xml_macros.py Log Message: ----------- Merge pull request #1388 from jmchilton/py3_2 Python 3 fixes and galaxy-lib updates from planemo. Compare: https://github.com/galaxyproject/galaxy/compare/61cba6c9429f...ded904cb1258