Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 24451e75d422d5d063c674cee353b6b80a0503e6
https://github.com/galaxyproject/galaxy/commit/24451e75d422d5d063c674cee353…
Author: Hervé Ménager <hmenager(a)pasteur.fr>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/sequence.py
M lib/galaxy/datatypes/tabular.py
Log Message:
-----------
add and/or correct missing EDAM formats/data to datatypes.
Commit: c450763e137e528392afdf17ad51c92426c267cf
https://github.com/galaxyproject/galaxy/commit/c450763e137e528392afdf17ad51…
Author: Hervé Ménager <hmenager(a)pasteur.fr>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M client/galaxy/scripts/layout/scratchbook.js
M client/galaxy/scripts/mvc/history/history-model.js
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/ui/ui-frames.js
M client/galaxy/style/less/frame.less
M doc/source/dev/faq.rst
M lib/galaxy/auth/providers/ldap_ad.py
M lib/galaxy/datatypes/binary.py
A lib/galaxy/datatypes/checkers.py
M lib/galaxy/datatypes/mothur.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/text.py
M lib/galaxy/external_services/actions.py
M lib/galaxy/external_services/parameters.py
M lib/galaxy/external_services/service.py
M lib/galaxy/forms/forms.py
M lib/galaxy/jobs/metrics/collectl/processes.py
M lib/galaxy/jobs/runners/condor.py
M lib/galaxy/jobs/runners/local.py
M lib/galaxy/jobs/runners/pulsar.py
M lib/galaxy/jobs/runners/slurm.py
M lib/galaxy/managers/citations.py
M lib/galaxy/managers/histories.py
M lib/galaxy/managers/tags.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py
M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py
M lib/galaxy/model/migrate/versions/0046_post_job_actions.py
M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py
M lib/galaxy/model/migrate/versions/0061_tasks.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/data/__init__.py
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/commands.py
M lib/galaxy/tools/deps/conda_util.py
M lib/galaxy/tools/deps/docker_util.py
M lib/galaxy/tools/deps/resolvers/conda.py
M lib/galaxy/tools/deps/resolvers/galaxy_packages.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/loader_directory.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/parser/yaml.py
M lib/galaxy/tools/toolbox/watcher.py
A lib/galaxy/tools/verify/__init__.py
A lib/galaxy/tools/verify/asserts/__init__.py
A lib/galaxy/tools/verify/asserts/tabular.py
A lib/galaxy/tools/verify/asserts/text.py
A lib/galaxy/tools/verify/asserts/xml.py
A lib/galaxy/tools/verify/test_data.py
M lib/galaxy/util/__init__.py
M lib/galaxy/util/checkers.py
M lib/galaxy/visualization/data_providers/genome.py
M lib/galaxy/visualization/plugins/config_parser.py
M lib/galaxy/visualization/plugins/registry.py
M lib/galaxy/visualization/plugins/resource_parser.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/base/pluginframework.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/external_services.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/tool_shed/security/__init__.py
M lib/galaxy/workflow/extract.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.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/repository_types/metadata.py
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/tool_dependency_util.py
M static/maps/layout/scratchbook.js.map
M static/maps/mvc/history/history-model.js.map
M static/maps/mvc/tool/tool-form-composite.js.map
M static/maps/mvc/ui/ui-frames.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/scratchbook.js
M static/scripts/mvc/history/history-model.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/scripts/mvc/ui/ui-frames.js
M static/style/blue/base.css
M templates/show_params.mako
M templates/webapps/galaxy/workflow/run.mako
M test/api/test_tools.py
M test/api/test_workflows.py
R test/base/asserts/__init__.py
R test/base/asserts/tabular.py
R test/base/asserts/text.py
R test/base/asserts/xml.py
R test/base/test_data.py
M test/base/twilltestcase.py
M test/functional/test_toolbox.py
A test/functional/tools/composite_output_tests.xml
M test/functional/tools/samples_tool_conf.xml
M test/functional/tools/simple_constructs.yml
M test/shed_functional/base/twilltestcase.py
M test/unit/managers/test_HistoryManager.py
M tools/filters/axt_to_lav.py
M tools/stats/gsummary.xml
Log Message:
-----------
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Commit: 835797c4bacfdc8b4a95c67a342181c78c17af25
https://github.com/galaxyproject/galaxy/commit/835797c4bacfdc8b4a95c67a3421…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/sequence.py
M lib/galaxy/datatypes/tabular.py
Log Message:
-----------
Merge pull request #2428 from hmenager/dev
Correct various EDAM data/format annotations in datatypes
Compare: https://github.com/galaxyproject/galaxy/compare/eefc73abae11...835797c4bacf
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 8aa629a98290876c7beab374d703b8d9ab24c576
https://github.com/galaxyproject/galaxy/commit/8aa629a98290876c7beab374d703…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/tool/tool-form-composite.js
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Updates and fixes of the run workflow ui elements and views
Commit: eefc73abae119f4e190af064905072aee9c0edca
https://github.com/galaxyproject/galaxy/commit/eefc73abae119f4e190af0649050…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-05-28 (Sat, 28 May 2016)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/tool/tool-form-composite.js
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Merge pull request #2416 from guerler/tool_composite_000
Updates and fixes for the run workflow ui elements
Compare: https://github.com/galaxyproject/galaxy/compare/3b73bb30382a...eefc73abae11
Branch: refs/heads/release_16.04
Home: https://github.com/galaxyproject/galaxy
Commit: a27e86786ad031eafcbfeb39ffdadf71d80dcfad
https://github.com/galaxyproject/galaxy/commit/a27e86786ad031eafcbfeb39ffda…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/external_services/actions.py
M lib/galaxy/external_services/parameters.py
M lib/galaxy/external_services/service.py
M lib/galaxy/forms/forms.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/visualization/data_providers/genome.py
M lib/galaxy/webapps/galaxy/controllers/external_services.py
M lib/galaxy/webapps/tool_shed/security/__init__.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/repository_types/metadata.py
M tools/filters/axt_to_lav.py
Log Message:
-----------
wrap bare str raises with generic Exception()
as Pyton 2.7 does not support bare str
Commit: fe64a8198bca75f2e535efc7c3813d24810904ab
https://github.com/galaxyproject/galaxy/commit/fe64a8198bca75f2e535efc7c381…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/security/__init__.py
Log Message:
-----------
fix the mess made with mass edit
Commit: 6094990e43f6510833395885d234a2264e7d44f1
https://github.com/galaxyproject/galaxy/commit/6094990e43f6510833395885d234…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/external_services/actions.py
M lib/galaxy/external_services/parameters.py
M lib/galaxy/external_services/service.py
M lib/galaxy/forms/forms.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/visualization/data_providers/genome.py
M lib/galaxy/webapps/galaxy/controllers/external_services.py
M lib/galaxy/webapps/tool_shed/security/__init__.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/repository_types/metadata.py
M tools/filters/axt_to_lav.py
Log Message:
-----------
Merge pull request #2424 from martenson/port-exceptionwrap-16.04
[16.04] wrap bare str exceptions
Compare: https://github.com/galaxyproject/galaxy/compare/c63bf911bc9c...6094990e43f6
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: d72eee3d4a136e99ff3bb1927bb3a4ad1a3e4b0e
https://github.com/galaxyproject/galaxy/commit/d72eee3d4a136e99ff3bb1927bb3…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/external_services/actions.py
M lib/galaxy/external_services/parameters.py
M lib/galaxy/external_services/service.py
M lib/galaxy/forms/forms.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/visualization/data_providers/genome.py
M lib/galaxy/webapps/galaxy/controllers/external_services.py
M lib/galaxy/webapps/tool_shed/security/__init__.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/repository_types/metadata.py
M tools/filters/axt_to_lav.py
Log Message:
-----------
wrap bare str raises with generic Exception()
as Pyton 2.7 does not support bare str
Commit: 125453707588cab9157aba497803f89f700971e5
https://github.com/galaxyproject/galaxy/commit/125453707588cab9157aba497803…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/security/__init__.py
Log Message:
-----------
fix the mess made with mass edit
Commit: ef417464c7cf25b5c9a4526ed31817d80553420a
https://github.com/galaxyproject/galaxy/commit/ef417464c7cf25b5c9a4526ed318…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/external_services/actions.py
M lib/galaxy/external_services/parameters.py
M lib/galaxy/external_services/service.py
M lib/galaxy/forms/forms.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/visualization/data_providers/genome.py
M lib/galaxy/webapps/galaxy/controllers/external_services.py
M lib/galaxy/webapps/tool_shed/security/__init__.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/repository_types/metadata.py
M tools/filters/axt_to_lav.py
Log Message:
-----------
Merge pull request #2421 from martenson/wrap-str-raises
wrap bare str raises with generic Exception()
Compare: https://github.com/galaxyproject/galaxy/compare/35da049d4299...ef417464c7cf
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 03a92abdb65a040b0feaf4ef8979ff24b9537bd6
https://github.com/galaxyproject/galaxy/commit/03a92abdb65a040b0feaf4ef8979…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/auth/providers/ldap_ad.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/mothur.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/text.py
M lib/galaxy/jobs/metrics/collectl/processes.py
M lib/galaxy/jobs/runners/local.py
M lib/galaxy/jobs/runners/pulsar.py
M lib/galaxy/managers/citations.py
M lib/galaxy/managers/tags.py
M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py
M lib/galaxy/model/migrate/versions/0046_post_job_actions.py
M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py
M lib/galaxy/model/migrate/versions/0061_tasks.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/data/__init__.py
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/resolvers/conda.py
M lib/galaxy/tools/deps/resolvers/galaxy_packages.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/loader_directory.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/util/__init__.py
M lib/galaxy/visualization/plugins/config_parser.py
M lib/galaxy/visualization/plugins/registry.py
M lib/galaxy/visualization/plugins/resource_parser.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/base/pluginframework.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/workflow/extract.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/tool_dependency_util.py
Log Message:
-----------
Python3: use log.warning() instead of deprecated log.warn()
$ python3 -Wd -c 'import logging; logging.warn("foo")'
-c:1: DeprecationWarning: The 'warn' function is deprecated, use 'warning' instead
WARNING:root:foo
Commit: 35da049d4299e84db09dc46f9d23524acb15e35c
https://github.com/galaxyproject/galaxy/commit/35da049d4299e84db09dc46f9d23…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M lib/galaxy/auth/providers/ldap_ad.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/mothur.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/text.py
M lib/galaxy/jobs/metrics/collectl/processes.py
M lib/galaxy/jobs/runners/local.py
M lib/galaxy/jobs/runners/pulsar.py
M lib/galaxy/managers/citations.py
M lib/galaxy/managers/tags.py
M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py
M lib/galaxy/model/migrate/versions/0046_post_job_actions.py
M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py
M lib/galaxy/model/migrate/versions/0061_tasks.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/data/__init__.py
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/resolvers/conda.py
M lib/galaxy/tools/deps/resolvers/galaxy_packages.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/loader_directory.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/util/__init__.py
M lib/galaxy/visualization/plugins/config_parser.py
M lib/galaxy/visualization/plugins/registry.py
M lib/galaxy/visualization/plugins/resource_parser.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/base/pluginframework.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/workflow/extract.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/tool_dependency_util.py
Log Message:
-----------
Merge pull request #2420 from nsoranzo/log_warn
Python3: use log.warning() instead of deprecated log.warn()
Compare: https://github.com/galaxyproject/galaxy/compare/1453dbdb13fd...35da049d4299