Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9b4de72ca68afc2353beff333775422039baae25 https://github.com/galaxyproject/galaxy/commit/9b4de72ca68afc2353beff3337754... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M .ci/flake8_lint_include_list.txt M config/plugins/webhooks/demo/tour_generator/helper/__init__.py M cron/add_manual_builds.py M cron/build_chrom_db.py M cron/parse_builds.py M cron/parse_builds_3_sites.py M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/datatypes/annotation.py M lib/galaxy/datatypes/assembly.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/constructive_solid_geometry.py M lib/galaxy/datatypes/converters/bed_to_gff_converter.py M lib/galaxy/datatypes/converters/fastqsolexa_to_qual_converter.py M lib/galaxy/datatypes/converters/gff_to_bed_converter.py M lib/galaxy/datatypes/converters/interval_to_bed_converter.py M lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py M lib/galaxy/datatypes/converters/interval_to_coverage.py M lib/galaxy/datatypes/converters/interval_to_fli.py M lib/galaxy/datatypes/converters/lped_to_fped_converter.py M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py M lib/galaxy/datatypes/converters/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/display_applications/application.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/images.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/msa.py M lib/galaxy/datatypes/ngsindex.py M lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/qualityscore.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/datatypes/tracks.py M lib/galaxy/datatypes/util/generic_util.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/cli.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/godocker.py M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/jobs/runners/pbs.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/jobs/runners/state_handler_factory.py M lib/galaxy/jobs/runners/tasks.py M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/job/torque.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/context.py M lib/galaxy/model/__init__.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/model/migrate/check.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.py M lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py M lib/galaxy/model/migrate/versions/0033_published_cols_for_histories_and_workflows.py M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py M lib/galaxy/model/migrate/versions/0042_workflow_invocation_fix.py M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py M lib/galaxy/model/migrate/versions/0061_tasks.py M lib/galaxy/model/migrate/versions/0076_fix_form_values_data_corruption.py M lib/galaxy/model/migrate/versions/0115_longer_user_password_field.py M lib/galaxy/model/tool_shed_install/migrate/check.py M lib/galaxy/sample_tracking/external_service_types.py M lib/galaxy/sample_tracking/request_types.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dynamic_options.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/parser/output_actions.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/util/maf_utilities.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/__init__.py M lib/galaxy/util/checkers.py M lib/galaxy/util/dictifiable.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/heartbeat.py M lib/galaxy/util/image_util.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/util/path/ntpath.py M lib/galaxy/util/sanitize_html.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/error.py M lib/galaxy/web/framework/middleware/sentry.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/webapps/galaxy/api/authenticate.py M lib/galaxy/webapps/galaxy/api/forms.py M lib/galaxy/webapps/galaxy/api/group_roles.py M lib/galaxy/webapps/galaxy/api/group_users.py M lib/galaxy/webapps/galaxy/api/groups.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/api/library_datasets.py M lib/galaxy/webapps/galaxy/api/request_types.py M lib/galaxy/webapps/galaxy/api/requests.py M lib/galaxy/webapps/galaxy/api/roles.py M lib/galaxy/webapps/galaxy/api/samples.py M lib/galaxy/webapps/galaxy/api/tool_data.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/external_service.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/request_type.py M lib/galaxy/webapps/galaxy/controllers/requests_admin.py M lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/reports/controllers/system.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/model/migrate/check.py M lib/galaxy_ext/metadata/set_metadata.py M lib/psyco_full.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/grids/util.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/admin_util.py M lib/tool_shed/util/basic_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py M scripts/build_toolbox.py M scripts/check_galaxy.py M scripts/cleanup_datasets/cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.py M scripts/drmaa_external_runner.py M scripts/helper.py M scripts/loc_files/create_all_fasta_loc.py M scripts/microbes/BeautifulSoup.py M scripts/microbes/create_bacteria_loc_file.py M scripts/microbes/create_bacteria_table.py M scripts/microbes/create_nib_seq_loc_file.py M scripts/microbes/get_builds_lengths.py M scripts/microbes/harvest_bacteria.py M scripts/microbes/ncbi_to_ucsc.py M scripts/microbes/util.py M scripts/others/incorrect_gops_jobs.py M scripts/others/incorrect_gops_join_jobs.py M scripts/paster.py M scripts/rst2html.py M scripts/runtime_stats.py M scripts/tool_shed/migrate_tools_to_repositories.py M setup.cfg M test/base/testcase.py M test/functional/twilltestcase.py M test/shed_functional/base/twilltestcase.py M test/unit/tools/test_tool_deps.py M tools/data_source/data_source.py M tools/data_source/import.py M tools/data_source/microbial_import.py M tools/data_source/microbial_import_code.py M tools/data_source/upload.py M tools/evolution/codingSnps_filter.py M tools/extract/extract_genomic_dna.py M tools/extract/liftOver_wrapper.py M tools/filters/axt_to_lav.py M tools/filters/bed_to_gff_converter.py M tools/filters/catWrapper.py M tools/filters/convert_characters.py M tools/filters/gff/extract_GFF_Features.py M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff_to_bed_converter.py M tools/filters/gtf_to_bedgraph_converter.py M tools/filters/join.py M tools/filters/lav_to_bed_code.py M tools/filters/mergeCols.py M tools/filters/sff_extract.py M tools/filters/ucsc_gene_bed_to_exon_bed.py M tools/filters/ucsc_gene_bed_to_intron_bed.py M tools/filters/ucsc_gene_table_to_intervals.py M tools/genomespace/genomespace_importer.py M tools/maf/maf_by_block_number.py M tools/maf/maf_filter.py M tools/maf/maf_limit_size.py M tools/maf/maf_limit_to_species.py M tools/maf/maf_reverse_complement.py M tools/maf/maf_stats.py M tools/maf/maf_thread_for_species.py M tools/maf/maf_to_bed.py M tools/maf/vcf_to_maf_customtrack.py M tools/metag_tools/blat_wrapper.py M tools/metag_tools/shrimp_color_wrapper.py M tools/metag_tools/shrimp_wrapper.py M tools/next_gen_conversion/solid2fastq.py M tools/plotting/bar_chart.py M tools/solid_tools/maq_cs_wrapper.py M tools/solid_tools/solid_qual_stats.py M tools/sr_mapping/bfast_wrapper.py M tools/stats/aggregate_scores_in_intervals.py M tools/stats/filtering.py M tools/stats/grouping.py M tools/stats/gsummary.py Log Message: ----------- Fix all E722 errors and ignore E741 Introduced in flake8 3.5.0 Fix import order. Commit: 62826a116054030ba50b801f3923a24768de197c https://github.com/galaxyproject/galaxy/commit/62826a116054030ba50b801f3923a... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M .ci/flake8_lint_include_list.txt M config/plugins/webhooks/demo/tour_generator/helper/__init__.py M cron/add_manual_builds.py M cron/build_chrom_db.py M cron/parse_builds.py M cron/parse_builds_3_sites.py M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/datatypes/annotation.py M lib/galaxy/datatypes/assembly.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/constructive_solid_geometry.py M lib/galaxy/datatypes/converters/bed_to_gff_converter.py M lib/galaxy/datatypes/converters/fastqsolexa_to_qual_converter.py M lib/galaxy/datatypes/converters/gff_to_bed_converter.py M lib/galaxy/datatypes/converters/interval_to_bed_converter.py M lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py M lib/galaxy/datatypes/converters/interval_to_coverage.py M lib/galaxy/datatypes/converters/interval_to_fli.py M lib/galaxy/datatypes/converters/lped_to_fped_converter.py M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py M lib/galaxy/datatypes/converters/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/display_applications/application.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/images.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/msa.py M lib/galaxy/datatypes/ngsindex.py M lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/qualityscore.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/datatypes/tracks.py M lib/galaxy/datatypes/util/generic_util.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/cli.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/godocker.py M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/jobs/runners/pbs.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/jobs/runners/state_handler_factory.py M lib/galaxy/jobs/runners/tasks.py M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/job/torque.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/context.py M lib/galaxy/model/__init__.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/model/migrate/check.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.py M lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py M lib/galaxy/model/migrate/versions/0033_published_cols_for_histories_and_workflows.py M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py M lib/galaxy/model/migrate/versions/0042_workflow_invocation_fix.py M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py M lib/galaxy/model/migrate/versions/0061_tasks.py M lib/galaxy/model/migrate/versions/0076_fix_form_values_data_corruption.py M lib/galaxy/model/migrate/versions/0115_longer_user_password_field.py M lib/galaxy/model/tool_shed_install/migrate/check.py M lib/galaxy/sample_tracking/external_service_types.py M lib/galaxy/sample_tracking/request_types.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dynamic_options.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/parser/output_actions.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/util/maf_utilities.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/__init__.py M lib/galaxy/util/checkers.py M lib/galaxy/util/dictifiable.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/heartbeat.py M lib/galaxy/util/image_util.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/util/path/ntpath.py M lib/galaxy/util/sanitize_html.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/error.py M lib/galaxy/web/framework/middleware/sentry.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/webapps/galaxy/api/authenticate.py M lib/galaxy/webapps/galaxy/api/forms.py M lib/galaxy/webapps/galaxy/api/group_roles.py M lib/galaxy/webapps/galaxy/api/group_users.py M lib/galaxy/webapps/galaxy/api/groups.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/api/library_datasets.py M lib/galaxy/webapps/galaxy/api/request_types.py M lib/galaxy/webapps/galaxy/api/requests.py M lib/galaxy/webapps/galaxy/api/roles.py M lib/galaxy/webapps/galaxy/api/samples.py M lib/galaxy/webapps/galaxy/api/tool_data.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/external_service.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/request_type.py M lib/galaxy/webapps/galaxy/controllers/requests_admin.py M lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/reports/controllers/system.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/model/migrate/check.py M lib/galaxy_ext/metadata/set_metadata.py M lib/psyco_full.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/grids/util.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/admin_util.py M lib/tool_shed/util/basic_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py M scripts/build_toolbox.py M scripts/check_galaxy.py M scripts/cleanup_datasets/cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.py M scripts/drmaa_external_runner.py M scripts/helper.py M scripts/loc_files/create_all_fasta_loc.py M scripts/microbes/BeautifulSoup.py M scripts/microbes/create_bacteria_loc_file.py M scripts/microbes/create_bacteria_table.py M scripts/microbes/create_nib_seq_loc_file.py M scripts/microbes/get_builds_lengths.py M scripts/microbes/harvest_bacteria.py M scripts/microbes/ncbi_to_ucsc.py M scripts/microbes/util.py M scripts/others/incorrect_gops_jobs.py M scripts/others/incorrect_gops_join_jobs.py M scripts/paster.py M scripts/rst2html.py M scripts/runtime_stats.py M scripts/tool_shed/migrate_tools_to_repositories.py M setup.cfg M test/base/testcase.py M test/functional/twilltestcase.py M test/shed_functional/base/twilltestcase.py M test/unit/tools/test_tool_deps.py M tools/data_source/data_source.py M tools/data_source/import.py M tools/data_source/microbial_import.py M tools/data_source/microbial_import_code.py M tools/data_source/upload.py M tools/evolution/codingSnps_filter.py M tools/extract/extract_genomic_dna.py M tools/extract/liftOver_wrapper.py M tools/filters/axt_to_lav.py M tools/filters/bed_to_gff_converter.py M tools/filters/catWrapper.py M tools/filters/convert_characters.py M tools/filters/gff/extract_GFF_Features.py M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff_to_bed_converter.py M tools/filters/gtf_to_bedgraph_converter.py M tools/filters/join.py M tools/filters/lav_to_bed_code.py M tools/filters/mergeCols.py M tools/filters/sff_extract.py M tools/filters/ucsc_gene_bed_to_exon_bed.py M tools/filters/ucsc_gene_bed_to_intron_bed.py M tools/filters/ucsc_gene_table_to_intervals.py M tools/genomespace/genomespace_importer.py M tools/maf/maf_by_block_number.py M tools/maf/maf_filter.py M tools/maf/maf_limit_size.py M tools/maf/maf_limit_to_species.py M tools/maf/maf_reverse_complement.py M tools/maf/maf_stats.py M tools/maf/maf_thread_for_species.py M tools/maf/maf_to_bed.py M tools/maf/vcf_to_maf_customtrack.py M tools/metag_tools/blat_wrapper.py M tools/metag_tools/shrimp_color_wrapper.py M tools/metag_tools/shrimp_wrapper.py M tools/next_gen_conversion/solid2fastq.py M tools/plotting/bar_chart.py M tools/solid_tools/maq_cs_wrapper.py M tools/solid_tools/solid_qual_stats.py M tools/sr_mapping/bfast_wrapper.py M tools/stats/aggregate_scores_in_intervals.py M tools/stats/filtering.py M tools/stats/grouping.py M tools/stats/gsummary.py Log Message: ----------- Merge pull request #4847 from nsoranzo/flake8_3.5.0 Fix all E722 errors and ignore E741 Compare: https://github.com/galaxyproject/galaxy/compare/fa295c0f6346...62826a116054