Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 78011993a1c57485e0711e7ae7ec93aadb8452fc https://github.com/galaxyproject/galaxy/commit/78011993a1c57485e0711e7ae7ec9... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M lib/galaxy/auth/providers/__init__.py M lib/galaxy/dataset_collections/types/__init__.py M lib/galaxy/jobs/datasets.py M lib/galaxy/jobs/metrics/instrumenters/__init__.py M lib/galaxy/jobs/runners/util/cli/__init__.py M lib/galaxy/jobs/runners/util/cli/job/__init__.py M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/shell/__init__.py M lib/galaxy/jobs/runners/util/cli/shell/local.py M lib/galaxy/jobs/runners/util/cli/shell/rsh.py M lib/galaxy/jobs/runners/util/condor/__init__.py M lib/galaxy/jobs/runners/util/kill.py M lib/galaxy/jobs/runners/util/retry.py M lib/galaxy/jobs/runners/util/sudo.py M lib/galaxy/tools/deps/container_resolvers/__init__.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/installable.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/toolbox/lineages/interface.py M lib/galaxy/tools/toolbox/tags.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/workflow/schedulers/__init__.py M lib/galaxy_utils/sequence/sequence.py
Log Message: ----------- Python3: use @six.add_metaclass() decorator
Also fix import order.
Commit: f8ef6e33a802aeb9eab06f7ca6ff039ed40e8df5 https://github.com/galaxyproject/galaxy/commit/f8ef6e33a802aeb9eab06f7ca6ff0... Author: John Chilton jmchilton@gmail.com Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M lib/galaxy/auth/providers/__init__.py M lib/galaxy/dataset_collections/types/__init__.py M lib/galaxy/jobs/datasets.py M lib/galaxy/jobs/metrics/instrumenters/__init__.py M lib/galaxy/jobs/runners/util/cli/__init__.py M lib/galaxy/jobs/runners/util/cli/job/__init__.py M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/shell/__init__.py M lib/galaxy/jobs/runners/util/cli/shell/local.py M lib/galaxy/jobs/runners/util/cli/shell/rsh.py M lib/galaxy/jobs/runners/util/condor/__init__.py M lib/galaxy/jobs/runners/util/kill.py M lib/galaxy/jobs/runners/util/retry.py M lib/galaxy/jobs/runners/util/sudo.py M lib/galaxy/tools/deps/container_resolvers/__init__.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/installable.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/toolbox/lineages/interface.py M lib/galaxy/tools/toolbox/tags.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/workflow/schedulers/__init__.py M lib/galaxy_utils/sequence/sequence.py
Log Message: ----------- Merge pull request #3491 from nsoranzo/python3
Python3: use @six.add_metaclass() decorator
Compare: https://github.com/galaxyproject/galaxy/compare/c163b70af23e...f8ef6e33a802