Branch: refs/heads/dev
Home:
https://github.com/galaxyproject/galaxy
Commit: 3163dc77f504a1923046e184c3d86822e34f940a
https://github.com/galaxyproject/galaxy/commit/3163dc77f504a1923046e184c3...
Author: Anthony Bretaudeau <anthony.bretaudeau(a)inria.fr>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M lib/galaxy/dependencies/__init__.py
M lib/galaxy/dependencies/conditional-requirements.txt
Log Message:
-----------
add python-ldap module if used in auth-conf.xml
Commit: 8b9d77ee3b8832c767dd2a34f23eb8bcc60d6423
https://github.com/galaxyproject/galaxy/commit/8b9d77ee3b8832c767dd2a34f2...
Author: Anthony Bretaudeau <anthony.bretaudeau(a)inria.fr>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M lib/galaxy/dependencies/__init__.py
Log Message:
-----------
detect actviedirectory too
Commit: b08dfa2e72ec7d49a6b9e50241dba082825f8061
https://github.com/galaxyproject/galaxy/commit/b08dfa2e72ec7d49a6b9e50241...
Author: Anthony Bretaudeau <anthony.bretaudeau(a)inria.fr>
Date: 2016-07-22 (Fri, 22 Jul 2016)
Changed paths:
M .ci/py3_sources.txt
M Makefile
M client/galaxy/scripts/mvc/collection/collection-li.js
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/dataset/data.js
M client/galaxy/scripts/mvc/form/form-data.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M client/galaxy/scripts/mvc/history/hdca-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/ui/ui-misc.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/mvc/ui/ui-tabs.js
M client/galaxy/style/less/ui.less
M config/datatypes_conf.xml.sample
M config/galaxy.ini.sample
M config/job_conf.xml.sample_advanced
M config/plugins/interactive_environments/jupyter/config/jupyter.xml
M config/plugins/visualizations/charts/static/app.css
M config/plugins/visualizations/charts/static/app.js
M config/plugins/visualizations/charts/static/charts/forms/default.js
M config/plugins/visualizations/charts/static/charts/jqplot/common/config.js
M config/plugins/visualizations/charts/static/charts/nvd3/common/config.js
M config/plugins/visualizations/charts/static/charts/nvd3/common/wrapper.js
M config/plugins/visualizations/charts/static/charts/nvd3/pie/config.js
M config/plugins/visualizations/charts/static/library/datasets.js
M config/plugins/visualizations/charts/static/library/jobs.js
M config/plugins/visualizations/charts/static/library/storage.js
R config/plugins/visualizations/charts/static/library/ui-table-form.js
M config/plugins/visualizations/charts/static/models/chart.js
M config/plugins/visualizations/charts/static/models/config.js
R config/plugins/visualizations/charts/static/models/group.js
R config/plugins/visualizations/charts/static/models/groups.js
M config/plugins/visualizations/charts/static/plugins/nvd3/nv.d3.css
M config/plugins/visualizations/charts/static/views/editor.js
R config/plugins/visualizations/charts/static/views/group.js
A config/plugins/visualizations/charts/static/views/groups.js
M config/plugins/visualizations/charts/static/views/settings.js
M config/plugins/visualizations/charts/static/views/types.js
M config/plugins/visualizations/charts/static/views/viewer.js
M config/plugins/visualizations/charts/static/views/viewport.js
M config/plugins/visualizations/graphviz/config/graphviz.xml
M config/plugins/visualizations/graphviz/static/js/graphVis.js
M config/plugins/visualizations/graphviz/static/js/toolPanelFunctions.js
M config/plugins/visualizations/graphviz/templates/graphviz.mako
A config/tool_destinations.yml.sample
A doc/source/admin/grt.rst
M doc/source/admin/index.rst
M doc/source/admin/interactive_environments.rst
M doc/source/dev/index.rst
A doc/source/dev/interactive_environments.rst
M lib/galaxy/config.py
M lib/galaxy/dataset_collections/structure.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/converters/bed_to_gff_converter.py
M lib/galaxy/datatypes/converters/fastq_to_fqtoc.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/lped_to_fped_converter.py
M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py
M lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
M lib/galaxy/datatypes/converters/maf_to_interval_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/converters/picard_interval_list_to_bed6_converter.py
M lib/galaxy/datatypes/converters/ref_to_seq_taxonomy_converter.py
M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py
M lib/galaxy/datatypes/data.py
M lib/galaxy/datatypes/dataproviders/column.py
M lib/galaxy/datatypes/dataproviders/line.py
M lib/galaxy/datatypes/molecules.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/util/gff_util.py
M lib/galaxy/dependencies/pinned-requirements.txt
M lib/galaxy/jobs/actions/post.py
A lib/galaxy/jobs/dynamic_tool_destination.py
M lib/galaxy/jobs/mapper.py
M lib/galaxy/jobs/runners/kubernetes.py
M lib/galaxy/managers/base.py
M lib/galaxy/managers/context.py
M lib/galaxy/managers/users.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/model/migrate/versions/0006_change_qual_datatype.py
M lib/galaxy/model/migrate/versions/0007_sharing_histories.py
M lib/galaxy/model/migrate/versions/0008_galaxy_forms.py
M lib/galaxy/model/migrate/versions/0009_request_table.py
M lib/galaxy/model/migrate/versions/0010_hda_display_at_authz_table.py
M lib/galaxy/model/migrate/versions/0011_v0010_mysql_index_fix.py
M lib/galaxy/model/migrate/versions/0012_user_address.py
M lib/galaxy/model/migrate/versions/0013_change_lib_item_templates_to_forms.py
M lib/galaxy/model/migrate/versions/0014_pages.py
M lib/galaxy/model/migrate/versions/0015_tagging.py
M lib/galaxy/model/migrate/versions/0016_v0015_mysql_index_fix.py
M lib/galaxy/model/migrate/versions/0017_library_item_indexes.py
M lib/galaxy/model/migrate/versions/0018_ordered_tags_and_page_tags.py
M lib/galaxy/model/migrate/versions/0019_request_library_folder.py
M lib/galaxy/model/migrate/versions/0020_library_upload_job.py
M lib/galaxy/model/migrate/versions/0021_user_prefs.py
M lib/galaxy/model/migrate/versions/0022_visualization_tables.py
M lib/galaxy/model/migrate/versions/0023_page_published_and_deleted_columns.py
M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.py
M lib/galaxy/model/migrate/versions/0025_user_info.py
M lib/galaxy/model/migrate/versions/0026_cloud_tables.py
M lib/galaxy/model/migrate/versions/0027_request_events.py
M lib/galaxy/model/migrate/versions/0028_external_metadata_file_override.py
M lib/galaxy/model/migrate/versions/0029_user_actions.py
M lib/galaxy/model/migrate/versions/0030_history_slug_column.py
M lib/galaxy/model/migrate/versions/0031_community_and_workflow_tags.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/0034_page_user_share_association.py
M lib/galaxy/model/migrate/versions/0035_item_annotations_and_workflow_step_tags.py
M
lib/galaxy/model/migrate/versions/0036_add_deleted_column_to_library_template_assoc_tables.py
M lib/galaxy/model/migrate/versions/0037_samples_library.py
M
lib/galaxy/model/migrate/versions/0038_add_inheritable_column_to_library_template_assoc_tables.py
M lib/galaxy/model/migrate/versions/0039_add_synopsis_column_to_library_table.py
M lib/galaxy/model/migrate/versions/0040_page_annotations.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/0043_visualization_sharing_tagging_annotating.py
M lib/galaxy/model/migrate/versions/0044_add_notify_column_to_request_table.py
M lib/galaxy/model/migrate/versions/0045_request_type_permissions_table.py
M lib/galaxy/model/migrate/versions/0046_post_job_actions.py
M lib/galaxy/model/migrate/versions/0047_job_table_user_id_column.py
M lib/galaxy/model/migrate/versions/0048_dataset_instance_state_column.py
M lib/galaxy/model/migrate/versions/0049_api_keys_table.py
M lib/galaxy/model/migrate/versions/0050_drop_cloud_tables.py
M lib/galaxy/model/migrate/versions/0051_imported_col_for_jobs_table.py
M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py
M lib/galaxy/model/migrate/versions/0053_item_ratings.py
M lib/galaxy/model/migrate/versions/0054_visualization_dbkey.py
M lib/galaxy/model/migrate/versions/0055_add_pja_assoc_for_jobs.py
M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py
M lib/galaxy/model/migrate/versions/0057_request_notify.py
M lib/galaxy/model/migrate/versions/0058_history_import_export.py
M lib/galaxy/model/migrate/versions/0059_sample_dataset_file_path.py
M lib/galaxy/model/migrate/versions/0060_history_archive_import.py
M lib/galaxy/model/migrate/versions/0061_tasks.py
M lib/galaxy/model/migrate/versions/0062_user_openid_table.py
M lib/galaxy/model/migrate/versions/0063_sequencer_table.py
M lib/galaxy/model/migrate/versions/0064_add_run_and_sample_run_association_tables.py
M lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py
M lib/galaxy/model/migrate/versions/0066_deferred_job_and_transfer_job_tables.py
M lib/galaxy/model/migrate/versions/0067_populate_sequencer_table.py
M lib/galaxy/model/migrate/versions/0068_rename_sequencer_to_external_services.py
M lib/galaxy/model/migrate/versions/0069_rename_sequencer_form_type.py
M lib/galaxy/model/migrate/versions/0070_add_info_column_to_deferred_job_table.py
M lib/galaxy/model/migrate/versions/0071_add_history_and_workflow_to_sample.py
M
lib/galaxy/model/migrate/versions/0072_add_pid_and_socket_columns_to_transfer_job_table.py
M lib/galaxy/model/migrate/versions/0073_add_ldda_to_implicit_conversion_table.py
M
lib/galaxy/model/migrate/versions/0074_add_purged_column_to_library_dataset_table.py
M lib/galaxy/model/migrate/versions/0075_add_subindex_column_to_run_table.py
M lib/galaxy/model/migrate/versions/0076_fix_form_values_data_corruption.py
M lib/galaxy/model/migrate/versions/0077_create_tool_tag_association_table.py
M lib/galaxy/model/migrate/versions/0078_add_columns_for_disk_usage_accounting.py
M lib/galaxy/model/migrate/versions/0079_input_library_to_job_table.py
M lib/galaxy/model/migrate/versions/0080_quota_tables.py
M lib/galaxy/model/migrate/versions/0081_add_tool_version_to_hda_ldda.py
M lib/galaxy/model/migrate/versions/0082_add_tool_shed_repository_table.py
M lib/galaxy/model/migrate/versions/0083_add_prepare_files_to_task.py
M lib/galaxy/model/migrate/versions/0084_add_ldda_id_to_implicit_conversion_table.py
M lib/galaxy/model/migrate/versions/0085_add_task_info.py
M lib/galaxy/model/migrate/versions/0086_add_tool_shed_repository_table_columns.py
M lib/galaxy/model/migrate/versions/0087_tool_id_guid_map_table.py
M lib/galaxy/model/migrate/versions/0088_add_installed_changeset_revison_column.py
M lib/galaxy/model/migrate/versions/0089_add_object_store_id_columns.py
M lib/galaxy/model/migrate/versions/0090_add_tool_shed_repository_table_columns.py
M lib/galaxy/model/migrate/versions/0091_add_tool_version_tables.py
M lib/galaxy/model/migrate/versions/0092_add_migrate_tools_table.py
M lib/galaxy/model/migrate/versions/0093_add_job_params_col.py
M lib/galaxy/model/migrate/versions/0094_add_job_handler_col.py
M lib/galaxy/model/migrate/versions/0095_hda_subsets.py
M lib/galaxy/model/migrate/versions/0096_openid_provider.py
M lib/galaxy/model/migrate/versions/0097_add_ctx_rev_column.py
M lib/galaxy/model/migrate/versions/0098_genome_index_tool_data_table.py
M lib/galaxy/model/migrate/versions/0099_add_tool_dependency_table.py
M
lib/galaxy/model/migrate/versions/0100_alter_tool_dependency_table_version_column.py
M lib/galaxy/model/migrate/versions/0101_drop_installed_changeset_revision_column.py
M lib/galaxy/model/migrate/versions/0102_add_tool_dependency_status_columns.py
M lib/galaxy/model/migrate/versions/0103_add_tool_shed_repository_status_columns.py
M lib/galaxy/model/migrate/versions/0105_add_cleanup_event_table.py
M lib/galaxy/model/migrate/versions/0106_add_missing_indexes.py
M lib/galaxy/model/migrate/versions/0107_add_exit_code_to_job_and_task.py
M lib/galaxy/model/migrate/versions/0108_add_extended_metadata.py
M lib/galaxy/model/migrate/versions/0109_add_repository_dependency_tables.py
M lib/galaxy/model/migrate/versions/0110_add_dataset_uuid.py
M lib/galaxy/model/migrate/versions/0111_add_job_destinations.py
M
lib/galaxy/model/migrate/versions/0112_add_data_manager_history_association_and_data_manager_job_association_tables.py
M lib/galaxy/model/migrate/versions/0113_update_migrate_tools_table.py
M lib/galaxy/model/migrate/versions/0114_update_migrate_tools_table_again.py
M
lib/galaxy/model/migrate/versions/0116_drop_update_available_col_add_tool_shed_status_col.py
M lib/galaxy/model/migrate/versions/0117_add_user_activation.py
M lib/galaxy/model/migrate/versions/0118_add_hda_extended_metadata.py
M lib/galaxy/model/migrate/versions/0119_job_metrics.py
M lib/galaxy/model/migrate/versions/0120_dataset_collections.py
M lib/galaxy/model/migrate/versions/0121_workflow_uuids.py
M lib/galaxy/model/migrate/versions/0122_grow_mysql_blobs.py
M lib/galaxy/model/migrate/versions/0123_add_workflow_request_tables.py
M lib/galaxy/model/migrate/versions/0124_job_state_history.py
M lib/galaxy/model/migrate/versions/0125_workflow_step_tracking.py
M lib/galaxy/model/migrate/versions/0126_password_reset.py
M lib/galaxy/model/migrate/versions/0127_output_collection_adjustments.py
M lib/galaxy/model/migrate/versions/0128_session_timeout.py
M lib/galaxy/model/migrate/versions/0129_job_external_output_metadata_validity.py
M lib/galaxy/model/migrate/versions/0130_change_pref_datatype.py
M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py
A lib/galaxy/model/migrate/versions/0132_add_lastpasswordchange_to_user.py
M lib/galaxy/security/__init__.py
M lib/galaxy/security/passwords.py
M lib/galaxy/security/validate_user_input.py
M lib/galaxy/tools/deps/conda_util.py
M lib/galaxy/tools/deps/resolvers/conda.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/dataset_matcher.py
M lib/galaxy/tools/wrappers.py
M lib/galaxy/util/__init__.py
M lib/galaxy/visualization/data_providers/phyloviz/newickparser.py
M lib/galaxy/visualization/genomes.py
M lib/galaxy/web/framework/base.py
M lib/galaxy/web/framework/decorators.py
M lib/galaxy/webapps/galaxy/api/datasets.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/tag.py
M lib/galaxy/webapps/galaxy/controllers/user.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/tool_shed/config.py
M lib/galaxy/workflow/modules.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M scripts/api/data_manager_example_execute.py
M scripts/api/example_watch_folder.py
M scripts/api/form_create_from_xml.py
M scripts/api/history_create_history.py
M scripts/api/history_delete_history.py
M scripts/api/import_library_dataset_to_history.py
M scripts/api/import_workflows_from_installed_tool_shed_repository.py
M scripts/api/library_create_folder.py
M scripts/api/library_create_library.py
M scripts/api/library_upload_from_import_dir.py
M scripts/api/load_data_with_metadata.py
M scripts/api/repair_tool_shed_repository.py
M scripts/api/request_type_create_from_xml.py
M scripts/api/requests_update_state.py
M scripts/api/sample_dataset_update_status.py
M scripts/api/sample_update_state.py
M scripts/api/search.py
M scripts/api/sequencer_configuration_create.py
M scripts/api/upload_to_history.py
M scripts/api/workflow_delete.py
M scripts/api/workflow_execute.py
M scripts/api/workflow_import.py
M scripts/api/workflow_import_from_file_rpark.py
M scripts/bootstrap_history.py
M scripts/build_toolbox.py
M scripts/check_galaxy.py
M scripts/check_python.py
M scripts/cleanup_datasets/pgcleanup.py
M scripts/cleanup_datasets/populate_uuid.py
M scripts/cleanup_datasets/remove_renamed_datasets_from_disk.py
M scripts/cleanup_datasets/rename_purged_datasets.py
M scripts/cleanup_datasets/update_dataset_size.py
M scripts/cleanup_datasets/update_metadata.py
M scripts/common_startup.sh
M scripts/data_libraries/build_whoosh_index.py
M scripts/db_shell.py
M scripts/drmaa_external_runner.py
M scripts/fetch_eggs.py
A scripts/grt.py
A scripts/grt.yml.sample
M setup.cfg
M static/maps/mvc/collection/collection-li.js.map
M static/maps/mvc/collection/collection-model.js.map
M static/maps/mvc/collection/collection-view-edit.js.map
M static/maps/mvc/collection/collection-view.js.map
M static/maps/mvc/dataset/data.js.map
M static/maps/mvc/form/form-data.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/history/hdca-li-edit.js.map
M static/maps/mvc/history/hdca-li.js.map
M static/maps/mvc/history/hdca-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/tool/tool-form-composite.js.map
M static/maps/mvc/tool/tool-template.js.map
M static/maps/mvc/ui/ui-misc.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/mvc/ui/ui-tabs.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/collection/collection-li.js
M static/scripts/mvc/collection/collection-model.js
M static/scripts/mvc/collection/collection-view-edit.js
M static/scripts/mvc/collection/collection-view.js
M static/scripts/mvc/dataset/data.js
M static/scripts/mvc/form/form-data.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/history/hdca-li-edit.js
M static/scripts/mvc/history/hdca-li.js
M static/scripts/mvc/history/hdca-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/scripts/mvc/tool/tool-template.js
M static/scripts/mvc/ui/ui-misc.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/mvc/ui/ui-tabs.js
M static/style/blue/base.css
M templates/admin/impersonate.mako
M templates/ind_share_base.mako
M templates/user/change_password.mako
M templates/webapps/galaxy/history/grid.mako
M test/api/helpers.py
M test/api/test_datasets.py
M test/api/test_tool_data.py
M test/api/test_tools.py
M test/api/test_users.py
M test/api/test_workflow_extraction.py
M test/api/test_workflows.py
A test/functional/tools/identifier_collection.xml
A test/functional/tools/output_filter_exception_1.xml
M test/functional/tools/samples_tool_conf.xml
M test/shed_functional/base/twilltestcase.py
M test/shed_functional/functional_tests.py
M test/unit/datatypes/dataproviders/test_base_dataproviders.py
M test/unit/datatypes/dataproviders/test_line_dataproviders.py
A test/unit/datatypes/test_data.py
A test/unit/jobs/dynamic_tool_destination/__init__.py
A test/unit/jobs/dynamic_tool_destination/data/dest_fail.yml
A test/unit/jobs/dynamic_tool_destination/data/priority_tool_destination.yml
A test/unit/jobs/dynamic_tool_destination/data/test.empty
A test/unit/jobs/dynamic_tool_destination/data/test.fasta
A test/unit/jobs/dynamic_tool_destination/data/test1.full
A test/unit/jobs/dynamic_tool_destination/data/test3.full
A test/unit/jobs/dynamic_tool_destination/data/test_no_verbose.yml
A test/unit/jobs/dynamic_tool_destination/data/test_num_input_datasets.yml
A test/unit/jobs/dynamic_tool_destination/data/test_users.yml
A test/unit/jobs/dynamic_tool_destination/data/tool_destination.yml
A test/unit/jobs/dynamic_tool_destination/mockGalaxy.py
A test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py
A test/unit/jobs/dynamic_tool_destination/ymltests.py
M test/unit/managers/base.py
M test/unit/managers/test_DatasetManager.py
M test/unit/managers/test_HDAManager.py
M test/unit/managers/test_HDCAManager.py
M test/unit/managers/test_HistoryContentsManager.py
M test/unit/managers/test_HistoryManager.py
M test/unit/managers/test_UserManager.py
M test/unit/test_galaxy_mapping.py
M test/unit/tools/test_conda_resolution.py
M test/unit/tools/test_toolbox.py
M test/unit/visualizations/plugins/test_VisualizationPlugin.py
M test/unit/visualizations/plugins/test_VisualizationsRegistry.py
M test/unit/web/base/test_HookPluginManager.py
M test/unit/web/base/test_PageServingPluginManager.py
M test/unit/web/base/test_PluginManager.py
M tools/stats/aggregate_scores_in_intervals.py
M tools/stats/gsummary.xml
M tox.ini
Log Message:
-----------
Merge remote-tracking branch 'upstream/dev' into ldap
Commit: 28e7f866cbab76e93f63179d4a7e6c2fd962b5b1
https://github.com/galaxyproject/galaxy/commit/28e7f866cbab76e93f63179d4a...
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-07-27 (Wed, 27 Jul 2016)
Changed paths:
M lib/galaxy/dependencies/__init__.py
M lib/galaxy/dependencies/conditional-requirements.txt
Log Message:
-----------
Merge pull request #2576 from abretaud/ldap
Add python-ldap module to conditional requirements
Compare:
https://github.com/galaxyproject/galaxy/compare/b74fd63feff0...28e7f866cbab