Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6f98634dd51ac40848a2e16662782378f8022bfd https://github.com/galaxyproject/galaxy/commit/6f98634dd51ac40848a2e16662782... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-06-27 (Tue, 27 Jun 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M lib/galaxy/dataset_collections/matching.py M lib/galaxy/dataset_collections/registry.py M lib/galaxy/dataset_collections/structure.py M lib/galaxy/dataset_collections/types/list.py M lib/galaxy/dataset_collections/types/paired.py M lib/galaxy/datatypes/blast.py M lib/galaxy/datatypes/chrominfo.py M lib/galaxy/datatypes/converters/bedgraph_to_array_tree_converter.py M lib/galaxy/datatypes/converters/fasta_to_tabular_converter.py M lib/galaxy/datatypes/converters/interval_to_fli.py M lib/galaxy/datatypes/converters/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/ref_to_seq_taxonomy_converter.py M lib/galaxy/datatypes/converters/sam_to_bam.py M lib/galaxy/datatypes/converters/vcf_to_interval_index_converter.py M lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.py M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py M lib/galaxy/datatypes/coverage.py M lib/galaxy/datatypes/dataproviders/chunk.py M lib/galaxy/datatypes/dataproviders/column.py M lib/galaxy/datatypes/dataproviders/dataset.py M lib/galaxy/datatypes/dataproviders/decorators.py M lib/galaxy/datatypes/dataproviders/external.py M lib/galaxy/datatypes/dataproviders/hierarchy.py M lib/galaxy/datatypes/dataproviders/line.py M lib/galaxy/datatypes/display_applications/application.py M lib/galaxy/datatypes/display_applications/parameters.py M lib/galaxy/datatypes/graph.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/neo4j.py M lib/galaxy/datatypes/qualityscore.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/triples.py M lib/galaxy/datatypes/util/gff_util.py M lib/galaxy/datatypes/xml.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/model/base.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/search.py M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/model/tool_shed_install/mapping.py M lib/galaxy/model/tool_shed_install/migrate/check.py M lib/galaxy/security/__init__.py M lib/galaxy/security/passwords.py M lib/galaxy/webhooks/__init__.py M lib/galaxy/work/context.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/render.py M lib/galaxy/workflow/run_request.py M lib/galaxy/workflow/scheduling_manager.py M lib/log_tempfile.py Log Message: ----------- Fix import order and Python3 compatibility for 51 files xref. https://github.com/galaxyproject/galaxy/issues/1715 Also remove unused `get_track_window()` method of some datatypes. Commit: 20ef3eebcf2cf02fa79ca752f79e430b14802800 https://github.com/galaxyproject/galaxy/commit/20ef3eebcf2cf02fa79ca752f79e4... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M lib/galaxy/dataset_collections/matching.py M lib/galaxy/dataset_collections/registry.py M lib/galaxy/dataset_collections/structure.py M lib/galaxy/dataset_collections/types/list.py M lib/galaxy/dataset_collections/types/paired.py M lib/galaxy/datatypes/blast.py M lib/galaxy/datatypes/chrominfo.py M lib/galaxy/datatypes/converters/bedgraph_to_array_tree_converter.py M lib/galaxy/datatypes/converters/fasta_to_tabular_converter.py M lib/galaxy/datatypes/converters/interval_to_fli.py M lib/galaxy/datatypes/converters/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/ref_to_seq_taxonomy_converter.py M lib/galaxy/datatypes/converters/sam_to_bam.py M lib/galaxy/datatypes/converters/vcf_to_interval_index_converter.py M lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.py M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py M lib/galaxy/datatypes/coverage.py M lib/galaxy/datatypes/dataproviders/chunk.py M lib/galaxy/datatypes/dataproviders/column.py M lib/galaxy/datatypes/dataproviders/dataset.py M lib/galaxy/datatypes/dataproviders/decorators.py M lib/galaxy/datatypes/dataproviders/external.py M lib/galaxy/datatypes/dataproviders/hierarchy.py M lib/galaxy/datatypes/dataproviders/line.py M lib/galaxy/datatypes/display_applications/application.py M lib/galaxy/datatypes/display_applications/parameters.py M lib/galaxy/datatypes/graph.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/neo4j.py M lib/galaxy/datatypes/qualityscore.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/triples.py M lib/galaxy/datatypes/util/gff_util.py M lib/galaxy/datatypes/xml.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/model/base.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/search.py M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/model/tool_shed_install/mapping.py M lib/galaxy/model/tool_shed_install/migrate/check.py M lib/galaxy/security/__init__.py M lib/galaxy/security/passwords.py M lib/galaxy/webhooks/__init__.py M lib/galaxy/work/context.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/render.py M lib/galaxy/workflow/run_request.py M lib/galaxy/workflow/scheduling_manager.py M lib/log_tempfile.py Log Message: ----------- Merge pull request #4236 from nsoranzo/python3 Fix import order and Python3 compatibility for 51 files Compare: https://github.com/galaxyproject/galaxy/compare/79f3dc00a61d...20ef3eebcf2c