mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-01 05:31:04 +08:00
Nate Coraor
97ad53f570
Conflicts: eggs.ini lib/galaxy/__init__.py lib/galaxy/datatypes/binary.py lib/galaxy/datatypes/converters/bgzip.py lib/galaxy/datatypes/converters/gff_to_interval_index_converter.py lib/galaxy/datatypes/converters/interval_to_bed_converter.py lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py lib/galaxy/datatypes/converters/interval_to_coverage.py lib/galaxy/datatypes/converters/interval_to_fli.py lib/galaxy/datatypes/converters/interval_to_tabix_converter.py lib/galaxy/datatypes/converters/maf_to_fasta_converter.py lib/galaxy/datatypes/converters/maf_to_interval_converter.py lib/galaxy/datatypes/converters/pbed_ldreduced_converter.py lib/galaxy/datatypes/converters/vcf_to_interval_index_converter.py lib/galaxy/datatypes/converters/vcf_to_vcf_bgzip.py lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py lib/galaxy/datatypes/coverage.py lib/galaxy/eggs/__init__.py lib/galaxy/eggs/dist.py lib/galaxy/eggs/scramble.py lib/galaxy/exceptions/__init__.py lib/galaxy/jobs/runners/pbs.py lib/galaxy/jobs/transfer_manager.py lib/galaxy/model/__init__.py lib/galaxy/model/migrate/check.py lib/galaxy/model/orm/__init__.py lib/galaxy/model/tool_shed_install/migrate/check.py lib/galaxy/web/framework/__init__.py lib/galaxy/web/framework/helpers/__init__.py lib/galaxy/web/framework/middleware/sentry.py lib/galaxy/web/framework/openid_manager.py lib/galaxy/web/framework/webapp.py lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py lib/galaxy/webapps/galaxy/controllers/dataset.py lib/galaxy/webapps/galaxy/controllers/library_common.py lib/galaxy/webapps/reports/controllers/workflows.py lib/galaxy/webapps/tool_shed/controllers/repository.py lib/galaxy/webapps/tool_shed/search/repo_search.py lib/galaxy/webapps/tool_shed/search/tool_search.py lib/galaxy_ext/metadata/set_metadata.py lib/pulsar/client/config_util.py lib/tool_shed/galaxy_install/install_manager.py lib/tool_shed/galaxy_install/migrate/check.py lib/tool_shed/grids/admin_grids.py lib/tool_shed/grids/repository_grids.py lib/tool_shed/repository_types/repository_suite_definition.py lib/tool_shed/repository_types/tool_dependency_definition.py lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py lib/tool_shed/scripts/check_repositories_for_functional_tests.py lib/tool_shed/scripts/check_s3_for_empty_tool_dependency_installation_paths.py lib/tool_shed/scripts/check_tool_dependency_definition_repositories.py lib/tool_shed/scripts/show_tool_dependency_installation_dir_contents.py lib/tool_shed/util/basic_util.py lib/tool_shed/util/encoding_util.py lib/tool_shed/util/hg_util.py scripts/check_eggs.py scripts/dist-scramble.py scripts/fetch_eggs.py scripts/make_egg_packager.py scripts/scramble.py scripts/scramble/lib/scramble_lib.py scripts/scramble/scripts/DRMAA_python-macosx.py scripts/scramble/scripts/DRMAA_python-solaris.py scripts/scramble/scripts/DRMAA_python.py scripts/scramble/scripts/MySQL_python-solaris.py scripts/scramble/scripts/MySQL_python.py scripts/scramble/scripts/PyRods.py scripts/scramble/scripts/bx_python-solaris.py scripts/scramble/scripts/generic.py scripts/scramble/scripts/pbs_python.py scripts/scramble/scripts/psycopg2-linux.py scripts/scramble/scripts/psycopg2-macosx.py scripts/scramble/scripts/psycopg2-solaris.py scripts/scramble/scripts/psycopg2.py scripts/scramble/scripts/pysam-solaris.py scripts/scramble/scripts/pysqlite.py scripts/test_dist_egg.py