- galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] d95e9b: Refactor move_file() method
by GitHub 15 Jun '16

15 Jun '16

Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: d95e9b840de5773337c80c612b790571e8229bfc https://github.com/galaxyproject/galaxy/commit/d95e9b840de5773337c80c612b79… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/tool_shed/util/basic_util.py Log Message: ----------- Refactor move_file() method Commit: d38936bd8d9b3612dc0718859067e299651e6c86 https://github.com/galaxyproject/galaxy/commit/d38936bd8d9b3612dc0718859067… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py Log Message: ----------- Move the whole directory instead of element by element Fix #1947. Commit: 75cdec9b4baa0a003b6516d524c625bb6aaa07bb https://github.com/galaxyproject/galaxy/commit/75cdec9b4baa0a003b6516d524c6… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-15 (Wed, 15 Jun 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/util/basic_util.py Log Message: ----------- Merge pull request #2479 from nsoranzo/release_16.01_fix_for_1947 [16.01] Fix move_directory_files tool dependency action when new_file_path is on a different filesystem Compare: https://github.com/galaxyproject/galaxy/compare/dbbf1edef3d9...75cdec9b4baa

1 0

[galaxyproject/galaxy] 2fce45: Merge pull request #4 from galaxyproject/dev
by GitHub 15 Jun '16

15 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2fce4553d8d0b37cc76a5b12788253f3478b9f14 https://github.com/galaxyproject/galaxy/commit/2fce4553d8d0b37cc76a5b127882… Author: Pablo Moreno <pcm32(a)users.noreply.github.com> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M .ci/py3_sources.txt M client/bower.json R client/galaxy/scripts/libs/tracekit.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/library.less M client/grunt-tasks/install-libs.js M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/job_conf.xml.sample_advanced M config/tool_conf.xml.sample M contrib/galaxy_config_merger.py M contrib/nagios/check_galaxy.py M cron/build_chrom_db.py M cron/parse_builds.py M cron/parse_builds_3_sites.py M lib/galaxy/config.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py A lib/galaxy/datatypes/test/NuBBE_1_obabel_3D.pdbqt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/drmaa.py A lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/s3.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py A lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/execute.py A lib/galaxy/tools/filter_failed_collection.xml A lib/galaxy/tools/flatten_collection.xml M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dataset_matcher.py M lib/galaxy/tools/parameters/meta.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/tools/toolbox/base.py A lib/galaxy/tools/unzip_collection.xml A lib/galaxy/tools/zip_collection.xml M lib/galaxy/util/__init__.py R lib/galaxy/util/directory_hash.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/api/categories.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/api/repository_revisions.py M lib/galaxy/webapps/tool_shed/controllers/admin.py M lib/galaxy/webapps/tool_shed/controllers/hg.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/controllers/repository_review.py M lib/galaxy/webapps/tool_shed/controllers/upload.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/galaxy/workflow/modules.py M lib/galaxy_utils/sequence/fastq.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/dependencies/attribute_handlers.py M lib/tool_shed/dependencies/repository/relation_builder.py M lib/tool_shed/galaxy_install/dependency_display.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/installed_repository_manager.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py M lib/tool_shed/galaxy_install/repair_repository_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/env_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/galaxy_install/tool_migration_manager.py M lib/tool_shed/galaxy_install/tools/tool_panel_manager.py M lib/tool_shed/galaxy_install/update_repository_manager.py M lib/tool_shed/grids/repository_grids.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/repository_registry.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/tools/tool_version_manager.py M lib/tool_shed/util/common_util.py M lib/tool_shed/util/container_util.py M lib/tool_shed/util/metadata_util.py M lib/tool_shed/util/readme_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/workflow_util.py M lib/tool_shed/utility_containers/utility_container_manager.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/cleanup_datasets.py R static/maps/libs/tracekit.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/tool/tools.js.map M static/maps/mvc/ui/ui-select-content.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 R static/scripts/libs/tracekit.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tools.js M static/scripts/mvc/ui/ui-select-content.js M static/style/blue/base.css M static/style/blue/library.css M templates/admin/tool_shed_repository/repair_repository.mako M templates/base.mako M templates/base/base_panels.mako M templates/js-app.mako M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/galaxy/workflow/sharing.mako M templates/webapps/tool_shed/repository/common.mako A test-data/biom1_metadata_test.txt A test-data/input_taxonomy.biom1 M test/api/helpers.py M test/api/test_tools.py M test/api/test_workflows.py M test/api/test_workflows_from_yaml.py M test/base/interactor.py M test/base/twilltestcase.py A test/functional/tools/exit_code_from_file.xml A test/functional/tools/metadata_biom1.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/shed_functional/base/twilltestcase.py M test/shed_functional/functional/test_0000_basic_repository_features.py M test/shed_functional/functional/test_1000_install_basic_repository.py M test/unit/tools/test_actions.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_dataset_matcher.py M test/unit/tools/test_parameter_parsing.py M test/unit/tools/test_select_parameters.py M test/unit/workflows/test_run_parameters.py M tool_list.py M tools/data_source/data_source.py M tools/data_source/fetch.py M tools/data_source/genbank.py M tools/data_source/hbvar_filter.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 Log Message: ----------- Merge pull request #4 from galaxyproject/dev Stays up-to-date with dev of galaxy project Commit: f3d73f37a2bdb8ed4a46c064243c35658f27a43b https://github.com/galaxyproject/galaxy/commit/f3d73f37a2bdb8ed4a46c064243c… Author: Pablo Moreno <pablo.a.moreno(a)gmail.com> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/kubernetes.py Log Message: ----------- Removes incorrect FALSE option for include_work_dir which makes certain jobs that discover files from working directories to fail recovering files when running through Kubernetes. Commit: dca91dae163fdcc94aff03920ee75514b7e98a5e https://github.com/galaxyproject/galaxy/commit/dca91dae163fdcc94aff03920ee7… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-15 (Wed, 15 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/kubernetes.py Log Message: ----------- Merge pull request #2498 from phnmnl/feature/fixFilesFromWorkDirIssue Kubernetes runner: fixes result files from work directory not being recovered issue Compare: https://github.com/galaxyproject/galaxy/compare/1b110299afbf...dca91dae163f

1 0

[galaxyproject/galaxy] e73e6b: Allow disabling separating tools commands into the...
by GitHub 15 Jun '16

15 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e73e6b3587a98e1537b82283f8935f770648b2e3 https://github.com/galaxyproject/galaxy/commit/e73e6b3587a98e1537b82283f893… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/command_factory.py Log Message: ----------- Allow disabling separating tools commands into their own script. Forcing them there broke Pulsar-on-Windows functionality - this fix is courtesy of @jj-umn. Commit: 54bffd93ac2a78f248e0d937ae0ea8e1aaafb131 https://github.com/galaxyproject/galaxy/commit/54bffd93ac2a78f248e0d937ae0e… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/jobs/command_factory.py Log Message: ----------- Spelling fix thanks to @nsoranzo. Commit: 4bf9955d0333af12d5b6dbdfe4336fda64f5a55e https://github.com/galaxyproject/galaxy/commit/4bf9955d0333af12d5b6dbdfe433… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Backport fac2efc4bd6b2214fa6d17e27b43d26fe4de7d37 to 16.04 to enable functional stats on main. Commit: e1cafd6ab45d385cfa46b16a2c4ab120fc3fde6f https://github.com/galaxyproject/galaxy/commit/e1cafd6ab45d385cfa46b16a2c4a… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt Log Message: ----------- Add conditional statsd requirement. Wheel is live on wheels.galaxyproject.org. Commit: 2aab4ee72198651a5017d37676853e74edec3b46 https://github.com/galaxyproject/galaxy/commit/2aab4ee72198651a5017d3767685… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/web/framework/middleware/statsd.py Log Message: ----------- More backporting of stats to make it functional on main. Commit: 8ef8522d68ea4d6b6c9a736ec4439306877fff13 https://github.com/galaxyproject/galaxy/commit/8ef8522d68ea4d6b6c9a736ec443… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/web/framework/middleware/statsd.py M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Merge pull request #2497 from dannon/backport_onion_rearrangement [16.04] Backport of stats fixes/prefix work. Commit: 7d962ee0cb6bcc83033363111d30be375a48a920 https://github.com/galaxyproject/galaxy/commit/7d962ee0cb6bcc83033363111d30… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-15 (Wed, 15 Jun 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/command_factory.py Log Message: ----------- Merge pull request #2492 from jmchilton/windows_no_shell [16.04] Allow disabling separating tools commands into their own script. Commit: 1b110299afbf01cfc275108b8de6193f17fbcbd8 https://github.com/galaxyproject/galaxy/commit/1b110299afbf01cfc275108b8de6… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-15 (Wed, 15 Jun 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/command_factory.py Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/f078365acc66...1b110299afbf

1 0

[galaxyproject/galaxy] e73e6b: Allow disabling separating tools commands into the...
by GitHub 15 Jun '16

15 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: e73e6b3587a98e1537b82283f8935f770648b2e3 https://github.com/galaxyproject/galaxy/commit/e73e6b3587a98e1537b82283f893… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/command_factory.py Log Message: ----------- Allow disabling separating tools commands into their own script. Forcing them there broke Pulsar-on-Windows functionality - this fix is courtesy of @jj-umn. Commit: 54bffd93ac2a78f248e0d937ae0ea8e1aaafb131 https://github.com/galaxyproject/galaxy/commit/54bffd93ac2a78f248e0d937ae0e… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/jobs/command_factory.py Log Message: ----------- Spelling fix thanks to @nsoranzo. Commit: 7d962ee0cb6bcc83033363111d30be375a48a920 https://github.com/galaxyproject/galaxy/commit/7d962ee0cb6bcc83033363111d30… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-15 (Wed, 15 Jun 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/command_factory.py Log Message: ----------- Merge pull request #2492 from jmchilton/windows_no_shell [16.04] Allow disabling separating tools commands into their own script. Compare: https://github.com/galaxyproject/galaxy/compare/8ef8522d68ea...7d962ee0cb6b

1 0

[galaxyproject/galaxy] 419594: Fixes the ability for users to toggle their filter...
by GitHub 14 Jun '16

14 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 419594845d15fc040d6c58f80096663e76fb3b80 https://github.com/galaxyproject/galaxy/commit/419594845d15fc040d6c58f80096… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Fixes the ability for users to toggle their filters. There's no reason to require a user_id here since it's locked to trans and require_login is set. Commit: 0c4fd995c5562863cbeb6945e95d13283506ea15 https://github.com/galaxyproject/galaxy/commit/0c4fd995c5562863cbeb6945e95d… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Fix module resolution for migrated toolbox filters path -- reuses (in a hacky way) the filtering function that was duplicated to galaxy.tools.toolbox.filters. Pushing more of this functionality (the docs, etc) into the FilterFactory might be nice down the road. Commit: f078365acc66748b272a00b81f9dcec7febf81fa https://github.com/galaxyproject/galaxy/commit/f078365acc66748b272a00b81f9d… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Merge pull request #2499 from dannon/user_tool_filter_fixes Toolbox filter fixes Compare: https://github.com/galaxyproject/galaxy/compare/bb851d6645bb...f078365acc66

1 0

[galaxyproject/galaxy] 1a4748: Update against latest galaxy-lib.
by GitHub 14 Jun '16

14 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1a474851973c8306ad4c7de7b00a4fc236ea3cb4 https://github.com/galaxyproject/galaxy/commit/1a474851973c8306ad4c7de7b00a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/tools/cwl/parser.py M lib/galaxy/tools/cwl/schema.py M lib/galaxy/tools/parser/cwl.py Log Message: ----------- Update against latest galaxy-lib. In return it needed to be updated for recent changes to cwltool and Galaxy. Commit: bb851d6645bb92ee51074cc442a5521f41a896f4 https://github.com/galaxyproject/galaxy/commit/bb851d6645bb92ee51074cc442a5… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M lib/galaxy/tools/cwl/parser.py M lib/galaxy/tools/cwl/schema.py M lib/galaxy/tools/parser/cwl.py Log Message: ----------- Merge pull request #2494 from jmchilton/galaxy-lib-update-2 Update against latest galaxy-lib. Compare: https://github.com/galaxyproject/galaxy/compare/0ed456ec47b1...bb851d6645bb

1 0

[galaxyproject/galaxy] 4bf995: Backport fac2efc4bd6b2214fa6d17e27b43d26fe4de7d37 ...
by GitHub 14 Jun '16

14 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 4bf9955d0333af12d5b6dbdfe4336fda64f5a55e https://github.com/galaxyproject/galaxy/commit/4bf9955d0333af12d5b6dbdfe433… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Backport fac2efc4bd6b2214fa6d17e27b43d26fe4de7d37 to 16.04 to enable functional stats on main. Commit: e1cafd6ab45d385cfa46b16a2c4ab120fc3fde6f https://github.com/galaxyproject/galaxy/commit/e1cafd6ab45d385cfa46b16a2c4a… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt Log Message: ----------- Add conditional statsd requirement. Wheel is live on wheels.galaxyproject.org. Commit: 2aab4ee72198651a5017d37676853e74edec3b46 https://github.com/galaxyproject/galaxy/commit/2aab4ee72198651a5017d3767685… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/web/framework/middleware/statsd.py Log Message: ----------- More backporting of stats to make it functional on main. Commit: 8ef8522d68ea4d6b6c9a736ec4439306877fff13 https://github.com/galaxyproject/galaxy/commit/8ef8522d68ea4d6b6c9a736ec443… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/web/framework/middleware/statsd.py M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Merge pull request #2497 from dannon/backport_onion_rearrangement [16.04] Backport of stats fixes/prefix work. Compare: https://github.com/galaxyproject/galaxy/compare/6ccfd13ab4e5...8ef8522d68ea

1 0

[galaxyproject/galaxy] a80eaa: Reduce duplication in galaxy.tools.parameters.wrap...
by GitHub 13 Jun '16

13 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a80eaae7fa380b0f6d484307bcfde179809dac54 https://github.com/galaxyproject/galaxy/commit/a80eaae7fa380b0f6d484307bcfd… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/parameters/wrapped.py Log Message: ----------- Reduce duplication in galaxy.tools.parameters.wrapped. Commit: 6ddb2c2a6a44c2947e7e9b6edbaa4e11ad289595 https://github.com/galaxyproject/galaxy/commit/6ddb2c2a6a44c2947e7e9b6edbaa… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py A lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/special_tools.py A lib/galaxy/tools/unzip_collection.xml A lib/galaxy/tools/zip_collection.xml M lib/galaxy/workflow/modules.py M test/api/test_tools.py M test/api/test_workflows.py M test/base/twilltestcase.py Log Message: ----------- Implement framework for model tools. This special class of tools leverages the infrastructure for tool inputs, tool state tracking, tool module for workflows, tool API, etc... without actually producing command-line jobs. Instead these tools are provided the input model objects and are expected to produce output model objects directly. This provides an oppertunity to copy HDAs without copying the underlying datasets. The first driving use case for these tools are also included - namely tools that allow zipping and unzipping paired collections. These tools can be mapped over lists (e.g. list:paired to (list, list) or the inverse) using much of the existing infrastructure for tools. Test cases included that validate these work with mapping operations and in workflows. The most obvious advantage of these versus traditional tools that do the same thing is that the data isn't copied on disk - new HDAs are created directly from the source datasets. Testing: This PR includes various API test cases for functionality, these can be run with the following command: ``` ./run_tests.sh -api test/api/test_tools.py:ToolsTestCase.test_unzip_collection ./run_tests.sh -api test/api/test_tools.py:ToolsTestCase.test_zip_inputs ./run_tests.sh -api test/api/test_tools.py:ToolsTestCase.test_zip_list_inputs ./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_workflow_run_zip_collections ``` Commit: ddeff4ec0cdb0c6a803ae09843d0c70e2a70556b https://github.com/galaxyproject/galaxy/commit/ddeff4ec0cdb0c6a803ae09843d0… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py A lib/galaxy/tools/filter_failed_collection.xml M lib/galaxy/tools/special_tools.py M test/api/helpers.py M test/api/test_tools.py A test/functional/tools/exit_code_from_file.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- New model tool that filters failed datasets out of a collection. This differs from a traditional tool in that its inputs don't need to be in an 'ok' state and instead of creating new datasets and duplicating data on disk, new HDAs are created from the existing datasets. Commit: 68a72069433a029e690535f14c1b4c91d1603499 https://github.com/galaxyproject/galaxy/commit/68a72069433a029e690535f14c1b… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/tools/__init__.py A lib/galaxy/tools/flatten_collection.xml M lib/galaxy/tools/special_tools.py Log Message: ----------- New model tool that flattens any collection into a list. Testing: ``` ./run_tests.sh -framework -id __FLATTEN__ ``` Commit: 8a0056530fec23d487f45e45dfa99ef6e61cc757 https://github.com/galaxyproject/galaxy/commit/8a0056530fec23d487f45e45dfa9… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/tool/tools.js M config/tool_conf.xml.sample M lib/galaxy/tools/__init__.py M lib/galaxy/tools/special_tools.py M lib/galaxy/tools/toolbox/base.py M static/maps/mvc/tool/tools.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/mvc/tool/tools.js M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Improve configuration and display of collection operation tools. Commit: a2578eb31a9a676355aab9c44b173b5d6f3a854c https://github.com/galaxyproject/galaxy/commit/a2578eb31a9a676355aab9c44b17… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/tools/__init__.py M test/api/test_tools.py Log Message: ----------- Update unzip collection action to allow it to be mapped over. Commit: d9a108ab10277bc0f2c967285f0ffd42f1141192 https://github.com/galaxyproject/galaxy/commit/d9a108ab10277bc0f2c967285f0f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/tools/filter_failed_collection.xml M lib/galaxy/tools/flatten_collection.xml M lib/galaxy/tools/unzip_collection.xml Log Message: ----------- fix few typos Commit: 80ac816af94d43d7214671582db127483baea2d3 https://github.com/galaxyproject/galaxy/commit/80ac816af94d43d7214671582db1… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/parameters/dataset_matcher.py Log Message: ----------- More general handling of what tool inputs are required in what state. Commit: d8ca09bcbe04ed665f4ebecbbd258b6c6e8494be https://github.com/galaxyproject/galaxy/commit/d8ca09bcbe04ed665f4ebecbbd25… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M test/api/test_tools.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_dataset_matcher.py M test/unit/tools/test_parameter_parsing.py Log Message: ----------- Test and linting fixes for fewer_collection_opts branch. Commit: af5f3bbdb5dbb7e065bd9b0413da39ddaa37c7cd https://github.com/galaxyproject/galaxy/commit/af5f3bbdb5dbb7e065bd9b0413da… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/tools/filter_failed_collection.xml Log Message: ----------- Update "description" of filter_failed_collection to mention only lists. Should address some confusion caused by the tool and reference in this review (https://github.com/galaxyproject/galaxy/pull/2434#issuecomment-225682424) Commit: 0ed456ec47b10a4c9d3948e647c41d555e3b44e0 https://github.com/galaxyproject/galaxy/commit/0ed456ec47b10a4c9d3948e647c4… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/tool/tools.js M config/tool_conf.xml.sample M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py A lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/execute.py A lib/galaxy/tools/filter_failed_collection.xml A lib/galaxy/tools/flatten_collection.xml M lib/galaxy/tools/parameters/dataset_matcher.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/tools/toolbox/base.py A lib/galaxy/tools/unzip_collection.xml A lib/galaxy/tools/zip_collection.xml M lib/galaxy/workflow/modules.py M static/maps/mvc/tool/tools.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/mvc/tool/tools.js M test/api/helpers.py M test/api/test_tools.py M test/api/test_workflows.py M test/base/twilltestcase.py A test/functional/tools/exit_code_from_file.xml M test/functional/tools/samples_tool_conf.xml M test/unit/tools/test_data_parameters.py M test/unit/tools/test_dataset_matcher.py M test/unit/tools/test_parameter_parsing.py Log Message: ----------- Merge pull request #2434 from jmchilton/fewer_collection_opts Collection Operations (Limited) Compare: https://github.com/galaxyproject/galaxy/compare/20f035dce887...0ed456ec47b1

1 0

[galaxyproject/galaxy] 16dfca: Merge branch 'release_16.04' of https://github.com...
by GitHub 13 Jun '16

13 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 16dfca86e69597796e60e604ae410dcf6667291c https://github.com/galaxyproject/galaxy/commit/16dfca86e69597796e60e604ae41… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-04-30 (Sat, 30 Apr 2016) Changed paths: M lib/galaxy/datatypes/data.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: 78c866fd34181ecda09488b6d19d2e37f6c69d02 https://github.com/galaxyproject/galaxy/commit/78c866fd34181ecda09488b6d19d… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-04 (Sat, 04 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Relax validation condition Commit: a44f30140990c93aa92b8cb5f0f87b819942b116 https://github.com/galaxyproject/galaxy/commit/a44f30140990c93aa92b8cb5f0f8… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-05 (Sun, 05 Jun 2016) Changed paths: M test/unit/tools/test_select_parameters.py Log Message: ----------- Revise contradicting test case, workflow injection through api attempts full validation without available datasets Commit: d9d51d362e8ef3197e01c0440289e60a50ad85e8 https://github.com/galaxyproject/galaxy/commit/d9d51d362e8ef3197e01c0440289… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Add break to interrupt loop Commit: 2cf95d8a134bb84cec0408b016e751fc840327c1 https://github.com/galaxyproject/galaxy/commit/2cf95d8a134bb84cec0408b016e7… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js M config/galaxy.ini.sample M doc/source/releases/16.01.rst A doc/source/releases/16.04.rst M doc/source/releases/16.04_announce.rst A doc/source/releases/16.07_announce.rst M doc/source/releases/index.rst A lib/galaxy/datatypes/checkers.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.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/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/managers/histories.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/tools/evaluation.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/util/checkers.py M lib/galaxy/version.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/external_services.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/tool_shed/security/__init__.py M lib/galaxy/workflow/run.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 static/maps/mvc/form/form-input.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/form/form-input.js M templates/show_params.mako M templates/webapps/galaxy/data_manager/view_job.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/galaxy/workflow/sharing.mako A test-data/biom1_metadata_test.txt A test-data/input_taxonomy.biom1 A test/functional/tools/metadata_biom1.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/unit/managers/test_HistoryManager.py M tools/filters/axt_to_lav.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: 7610f82a421edb422b8ba8f7731a1ae23fb9ac41 https://github.com/galaxyproject/galaxy/commit/7610f82a421edb422b8ba8f7731a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M templates/webapps/galaxy/workflow/sharing.mako Log Message: ----------- fix markup for button links on sharing template (ff would fail to generate images) turn of autocomplete Commit: 574740d0b299d9cd84d9065f4746204f6399d891 https://github.com/galaxyproject/galaxy/commit/574740d0b299d9cd84d9065f4746… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Reset exception retries after successful job status check Commit: 08fb160b38fbcd9bcdfd776bb75ae5c92ca002d1 https://github.com/galaxyproject/galaxy/commit/08fb160b38fbcd9bcdfd776bb75a… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M templates/webapps/galaxy/workflow/sharing.mako Log Message: ----------- Merge pull request #2481 from martenson/fix-html-sharing [16.04] fix markup for button links on sharing template Commit: 4cf8d691e525142125af56b0627f804eb1bddd7c https://github.com/galaxyproject/galaxy/commit/4cf8d691e525142125af56b0627f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- fix image generation for workflows with missing tools currently this ends up with a server error Commit: fdf9520783ae55795a01e4092b1d6718c5fca5b4 https://github.com/galaxyproject/galaxy/commit/fdf9520783ae55795a01e4092b1d… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- drop unnecessary raise and fix capitalization incorporate comments of Bjoern and Nicola Commit: 43694be8647e3d1686b6c4fa80d0300bb9c96d42 https://github.com/galaxyproject/galaxy/commit/43694be8647e3d1686b6c4fa80d0… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py M test/unit/tools/test_select_parameters.py Log Message: ----------- Merge pull request #2456 from guerler/fix_building_mode [16.04] Relax validation condition for dynamic parameters Commit: 5245e8a693fc3633762f29a468b84e3487083133 https://github.com/galaxyproject/galaxy/commit/5245e8a693fc3633762f29a468b8… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- Merge pull request #2488 from martenson/wrap-svg-for-missing-tools [16.04] fix image generation for workflows with missing tools Commit: b3a32ac2e19afda605f26f989bf3e16eaa1d27af https://github.com/galaxyproject/galaxy/commit/b3a32ac2e19afda605f26f989bf3… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M templates/webapps/galaxy/workflow/sharing.mako M test/unit/tools/test_select_parameters.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: 0017b3e9405e5e77904364025889c88cf0991744 https://github.com/galaxyproject/galaxy/commit/0017b3e9405e5e77904364025889… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- add IUC channel to the list Commit: ec0d97327b0bf234021f5a3f5ab261b491baa091 https://github.com/galaxyproject/galaxy/commit/ec0d97327b0bf234021f5a3f5ab2… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2490 from bgruening/iuc_conda_channel [16.04] Add IUC conda channel Commit: 6ccfd13ab4e500774a40a54deba949d29f719f2c https://github.com/galaxyproject/galaxy/commit/6ccfd13ab4e500774a40a54deba9… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge pull request #2487 from nsoranzo/release_16.04_reset_exception_retries [16.04] Reset exception retries after successful job status check Commit: 20f035dce887e5fcd04a5d7bdec92f80ba1fc9e2 https://github.com/galaxyproject/galaxy/commit/20f035dce887e5fcd04a5d7bdec9… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M templates/webapps/galaxy/workflow/sharing.mako M test/unit/tools/test_select_parameters.py Log Message: ----------- Merge branch 'release_16.04' into dev Conflicts: test/unit/tools/test_select_parameters.py Compare: https://github.com/galaxyproject/galaxy/compare/c797d2bc9e99...20f035dce887

1 0

[galaxyproject/galaxy] 574740: Reset exception retries after successful job statu...
by GitHub 13 Jun '16

13 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 574740d0b299d9cd84d9065f4746204f6399d891 https://github.com/galaxyproject/galaxy/commit/574740d0b299d9cd84d9065f4746… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Reset exception retries after successful job status check Commit: 6ccfd13ab4e500774a40a54deba949d29f719f2c https://github.com/galaxyproject/galaxy/commit/6ccfd13ab4e500774a40a54deba9… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge pull request #2487 from nsoranzo/release_16.04_reset_exception_retries [16.04] Reset exception retries after successful job status check Compare: https://github.com/galaxyproject/galaxy/compare/ec0d97327b0b...6ccfd13ab4e5

1 0

[galaxyproject/galaxy] fcc069: don't generate error for pairwise distance matrice...
by GitHub 13 Jun '16

13 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: fcc069042e97d90da61b6e2fe5c5f83541274455 https://github.com/galaxyproject/galaxy/commit/fcc069042e97d90da61b6e2fe5c5… Author: Saskia Hiltemann <zazkia(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/datatypes/mothur.py Log Message: ----------- don't generate error for pairwise distance matrices Commit: c797d2bc9e9905935650f5020ed3415297e882b3 https://github.com/galaxyproject/galaxy/commit/c797d2bc9e9905935650f5020ed3… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/datatypes/mothur.py Log Message: ----------- Merge pull request #2489 from shiltemann/dev mothur datatypes: don't generate error for pairwise distance matrices Compare: https://github.com/galaxyproject/galaxy/compare/77bd1d996de9...c797d2bc9e99

1 0

[galaxyproject/galaxy] 16dfca: Merge branch 'release_16.04' of https://github.com...
by GitHub 13 Jun '16

13 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 16dfca86e69597796e60e604ae410dcf6667291c https://github.com/galaxyproject/galaxy/commit/16dfca86e69597796e60e604ae41… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-04-30 (Sat, 30 Apr 2016) Changed paths: M lib/galaxy/datatypes/data.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: 2cf95d8a134bb84cec0408b016e751fc840327c1 https://github.com/galaxyproject/galaxy/commit/2cf95d8a134bb84cec0408b016e7… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js M config/galaxy.ini.sample M doc/source/releases/16.01.rst A doc/source/releases/16.04.rst M doc/source/releases/16.04_announce.rst A doc/source/releases/16.07_announce.rst M doc/source/releases/index.rst A lib/galaxy/datatypes/checkers.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.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/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/managers/histories.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/tools/evaluation.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/util/checkers.py M lib/galaxy/version.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/external_services.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/tool_shed/security/__init__.py M lib/galaxy/workflow/run.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 static/maps/mvc/form/form-input.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/form/form-input.js M templates/show_params.mako M templates/webapps/galaxy/data_manager/view_job.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/galaxy/workflow/sharing.mako A test-data/biom1_metadata_test.txt A test-data/input_taxonomy.biom1 A test/functional/tools/metadata_biom1.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml M test/unit/managers/test_HistoryManager.py M tools/filters/axt_to_lav.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: b3a32ac2e19afda605f26f989bf3e16eaa1d27af https://github.com/galaxyproject/galaxy/commit/b3a32ac2e19afda605f26f989bf3… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M templates/webapps/galaxy/workflow/sharing.mako M test/unit/tools/test_select_parameters.py Log Message: ----------- Merge branch 'release_16.04' of https://github.com/galaxyproject/galaxy into release_16.04 Commit: 0017b3e9405e5e77904364025889c88cf0991744 https://github.com/galaxyproject/galaxy/commit/0017b3e9405e5e77904364025889… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- add IUC channel to the list Commit: ec0d97327b0bf234021f5a3f5ab261b491baa091 https://github.com/galaxyproject/galaxy/commit/ec0d97327b0bf234021f5a3f5ab2… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-13 (Mon, 13 Jun 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2490 from bgruening/iuc_conda_channel [16.04] Add IUC conda channel Compare: https://github.com/galaxyproject/galaxy/compare/5245e8a693fc...ec0d97327b0b

1 0

[galaxyproject/galaxy] 4cf8d6: fix image generation for workflows with missing to...
by GitHub 11 Jun '16

11 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 4cf8d691e525142125af56b0627f804eb1bddd7c https://github.com/galaxyproject/galaxy/commit/4cf8d691e525142125af56b0627f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- fix image generation for workflows with missing tools currently this ends up with a server error Commit: fdf9520783ae55795a01e4092b1d6718c5fca5b4 https://github.com/galaxyproject/galaxy/commit/fdf9520783ae55795a01e4092b1d… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- drop unnecessary raise and fix capitalization incorporate comments of Bjoern and Nicola Commit: 5245e8a693fc3633762f29a468b84e3487083133 https://github.com/galaxyproject/galaxy/commit/5245e8a693fc3633762f29a468b8… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-06-11 (Sat, 11 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- Merge pull request #2488 from martenson/wrap-svg-for-missing-tools [16.04] fix image generation for workflows with missing tools Compare: https://github.com/galaxyproject/galaxy/compare/43694be8647e...5245e8a693fc

1 0

[galaxyproject/galaxy] 78c866: Relax validation condition
by GitHub 11 Jun '16

11 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 78c866fd34181ecda09488b6d19d2e37f6c69d02 https://github.com/galaxyproject/galaxy/commit/78c866fd34181ecda09488b6d19d… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-04 (Sat, 04 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Relax validation condition Commit: a44f30140990c93aa92b8cb5f0f87b819942b116 https://github.com/galaxyproject/galaxy/commit/a44f30140990c93aa92b8cb5f0f8… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-05 (Sun, 05 Jun 2016) Changed paths: M test/unit/tools/test_select_parameters.py Log Message: ----------- Revise contradicting test case, workflow injection through api attempts full validation without available datasets Commit: d9d51d362e8ef3197e01c0440289e60a50ad85e8 https://github.com/galaxyproject/galaxy/commit/d9d51d362e8ef3197e01c0440289… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Add break to interrupt loop Commit: 43694be8647e3d1686b6c4fa80d0300bb9c96d42 https://github.com/galaxyproject/galaxy/commit/43694be8647e3d1686b6c4fa80d0… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py M test/unit/tools/test_select_parameters.py Log Message: ----------- Merge pull request #2456 from guerler/fix_building_mode [16.04] Relax validation condition for dynamic parameters Compare: https://github.com/galaxyproject/galaxy/compare/08fb160b38fb...43694be8647e

1 0

[galaxyproject/galaxy] 7610f8: fix markup for button links on sharing template
by GitHub 10 Jun '16

10 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 7610f82a421edb422b8ba8f7731a1ae23fb9ac41 https://github.com/galaxyproject/galaxy/commit/7610f82a421edb422b8ba8f7731a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M templates/webapps/galaxy/workflow/sharing.mako Log Message: ----------- fix markup for button links on sharing template (ff would fail to generate images) turn of autocomplete Commit: 08fb160b38fbcd9bcdfd776bb75ae5c92ca002d1 https://github.com/galaxyproject/galaxy/commit/08fb160b38fbcd9bcdfd776bb75a… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M templates/webapps/galaxy/workflow/sharing.mako Log Message: ----------- Merge pull request #2481 from martenson/fix-html-sharing [16.04] fix markup for button links on sharing template Compare: https://github.com/galaxyproject/galaxy/compare/14844e48eb38...08fb160b38fb

1 0

[galaxyproject/usegalaxy-playbook] fa2feb: Switch Main to pycurl for Jetstream and enable the...
by GitHub 10 Jun '16

10 Jun '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: fa2febbe77a13f9dc77fc13a791723da8f0ee575 https://github.com/galaxyproject/usegalaxy-playbook/commit/fa2febbe77a13f9d… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M templates/galaxy/usegalaxy.org/config/job_conf.xml.j2 Log Message: ----------- Switch Main to pycurl for Jetstream and enable the transport timeout

1 0

[galaxyproject/galaxy] 7c40c8: Fix for job handlers losing track of jobs when usi...
by GitHub 10 Jun '16

10 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7c40c85034d918c50e8b22c1a3eb39746a6e043d https://github.com/galaxyproject/galaxy/commit/7c40c85034d918c50e8b22c1a3eb… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries Commit: 933f42619e2fb2fb518702397aa2f11ea2cfb8e0 https://github.com/galaxyproject/galaxy/commit/933f42619e2fb2fb518702397aa2… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Log all failed job status checks Commit: dbbf1edef3d943e13db4e926840061a65742eaab https://github.com/galaxyproject/galaxy/commit/dbbf1edef3d943e13db4e9268400… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge pull request #2484 from nsoranzo/release_16.01_fix_for_4a024b882f504aded1db32f1ed056f7c9109d218 [16.01] Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries Commit: 14844e48eb3869dbb2ecdca29e6069904bac4f28 https://github.com/galaxyproject/galaxy/commit/14844e48eb3869dbb2ecdca29e60… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Conflicts: lib/galaxy/jobs/runners/drmaa.py Commit: 77bd1d996de95d60d4e5e97ae533af6302612146 https://github.com/galaxyproject/galaxy/commit/77bd1d996de95d60d4e5e97ae533… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/8f647b763f13...77bd1d996de9

1 0

[galaxyproject/galaxy] 7c40c8: Fix for job handlers losing track of jobs when usi...
by GitHub 10 Jun '16

10 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 7c40c85034d918c50e8b22c1a3eb39746a6e043d https://github.com/galaxyproject/galaxy/commit/7c40c85034d918c50e8b22c1a3eb… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries Commit: 933f42619e2fb2fb518702397aa2f11ea2cfb8e0 https://github.com/galaxyproject/galaxy/commit/933f42619e2fb2fb518702397aa2… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Log all failed job status checks Commit: dbbf1edef3d943e13db4e926840061a65742eaab https://github.com/galaxyproject/galaxy/commit/dbbf1edef3d943e13db4e9268400… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge pull request #2484 from nsoranzo/release_16.01_fix_for_4a024b882f504aded1db32f1ed056f7c9109d218 [16.01] Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries Commit: 14844e48eb3869dbb2ecdca29e6069904bac4f28 https://github.com/galaxyproject/galaxy/commit/14844e48eb3869dbb2ecdca29e60… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Conflicts: lib/galaxy/jobs/runners/drmaa.py Compare: https://github.com/galaxyproject/galaxy/compare/04863c833bb1...14844e48eb38

1 0

[galaxyproject/usegalaxy-playbook] b24ec5: Add transport timeout options to RESTful Pulsar pl...
by GitHub 10 Jun '16

10 Jun '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: b24ec58dfe7c5a5a29c6859c1e510d99cd2aeac6 https://github.com/galaxyproject/usegalaxy-playbook/commit/b24ec58dfe7c5a5a… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2 Log Message: ----------- Add transport timeout options to RESTful Pulsar plugin

1 0

[galaxyproject/galaxy] 7c40c8: Fix for job handlers losing track of jobs when usi...
by GitHub 10 Jun '16

10 Jun '16

Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 7c40c85034d918c50e8b22c1a3eb39746a6e043d https://github.com/galaxyproject/galaxy/commit/7c40c85034d918c50e8b22c1a3eb… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries Commit: 933f42619e2fb2fb518702397aa2f11ea2cfb8e0 https://github.com/galaxyproject/galaxy/commit/933f42619e2fb2fb518702397aa2… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Log all failed job status checks Commit: dbbf1edef3d943e13db4e926840061a65742eaab https://github.com/galaxyproject/galaxy/commit/dbbf1edef3d943e13db4e9268400… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-10 (Fri, 10 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/drmaa.py Log Message: ----------- Merge pull request #2484 from nsoranzo/release_16.01_fix_for_4a024b882f504aded1db32f1ed056f7c9109d218 [16.01] Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries Compare: https://github.com/galaxyproject/galaxy/compare/47a651609600...dbbf1edef3d9

1 0

[galaxyproject/galaxy] 9f7d92: Set a default for tool_dependencies_dir.
by GitHub 09 Jun '16

09 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9f7d921d5d387f0704db66f9e190688122be9170 https://github.com/galaxyproject/galaxy/commit/9f7d921d5d387f0704db66f9e190… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py Log Message: ----------- Set a default for tool_dependencies_dir. This should make some obsecure errors less easy to encounter and makes it less work to get going with conda or the Tool Shed. With config sample fix from @martenson. Commit: 8f647b763f13b87bb69d2ec50f1c607cfa58a3b3 https://github.com/galaxyproject/galaxy/commit/8f647b763f13b87bb69d2ec50f1c… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py Log Message: ----------- Merge pull request #2480 from jmchilton/tool_dependencies_default Set a default for tool_dependencies_dir. Compare: https://github.com/galaxyproject/galaxy/compare/4da1f6a5eaf1...8f647b763f13

1 0

[galaxyproject/galaxy] b3edbc: Workaround for circular import situation.
by GitHub 09 Jun '16

09 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b3edbcaec785c93171ac5b08805dec3ade92e4b7 https://github.com/galaxyproject/galaxy/commit/b3edbcaec785c93171ac5b08805d… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/tool_shed/util/repository_util.py Log Message: ----------- Workaround for circular import situation. Commit: 4c6389fb05a50b8b2d8f5f3fb2c9ea635a2bb6a6 https://github.com/galaxyproject/galaxy/commit/4c6389fb05a50b8b2d8f5f3fb2c9… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/s3.py M lib/galaxy/util/__init__.py R lib/galaxy/util/directory_hash.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/tool_shed/util/repository_util.py Log Message: ----------- Move directory_hash_id into galaxy/util.py. Use util.directory_hash_id throughout. Commit: 89ba1ddef4706436aa5b2f30a37a8247755ea1a8 https://github.com/galaxyproject/galaxy/commit/89ba1ddef4706436aa5b2f30a37a… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/tool_shed/util/repository_util.py Log Message: ----------- Remove now-unused import. Commit: 4da1f6a5eaf1228aa42b0ee7e8d1327a58706602 https://github.com/galaxyproject/galaxy/commit/4da1f6a5eaf1228aa42b0ee7e8d1… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/s3.py M lib/galaxy/util/__init__.py R lib/galaxy/util/directory_hash.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/tool_shed/util/repository_util.py Log Message: ----------- Merge pull request #2477 from davebx/circular_workaround Workaround for circular import. Refactor. Compare: https://github.com/galaxyproject/galaxy/compare/b7108cfb8b62...4da1f6a5eaf1

1 0

[galaxyproject/galaxy] e370c5: Re-add get_updated_changeset_revisions_from_tool_s...
by GitHub 08 Jun '16

08 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e370c556498c45b9533276182aa7158aa730d83c https://github.com/galaxyproject/galaxy/commit/e370c556498c45b9533276182aa7… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M lib/tool_shed/util/metadata_util.py Log Message: ----------- Re-add get_updated_changeset_revisions_from_tool_shed() method It was accidentally removed in PR #2269. Fix toolshed tests Commit: b7108cfb8b622d2212505a1f55bc8b063d545723 https://github.com/galaxyproject/galaxy/commit/b7108cfb8b622d2212505a1f55bc… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M lib/tool_shed/util/metadata_util.py Log Message: ----------- Merge pull request #2472 from nsoranzo/fix_for_2269 Re-add get_updated_changeset_revisions_from_tool_shed() method Compare: https://github.com/galaxyproject/galaxy/compare/66e4750589db...b7108cfb8b62

1 0

[galaxyproject/galaxy] d2be9d: Prevent missing display to text values in workflow...
by GitHub 08 Jun '16

08 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d2be9dc98dbee387bec377a9c89685bb0011c85f https://github.com/galaxyproject/galaxy/commit/d2be9dc98dbee387bec377a9c896… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M templates/webapps/galaxy/workflow/display.mako Log Message: ----------- Prevent missing display to text values in workflow preview Commit: befe35456a606cab03c3119c013c5983323c16e3 https://github.com/galaxyproject/galaxy/commit/befe35456a606cab03c3119c013c… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M templates/webapps/galaxy/workflow/display.mako Log Message: ----------- Merge pull request #2471 from guerler/fix_workflow_display [16.04] Prevent missing display to text values in workflow preview Commit: 4cd2af860ffc31ee574e6f81c941840ae603efe5 https://github.com/galaxyproject/galaxy/commit/4cd2af860ffc31ee574e6f81c941… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Avoid empty strings when converting values to display text Commit: 04863c833bb1de9c298600be7c2de44d2b6b694b https://github.com/galaxyproject/galaxy/commit/04863c833bb1de9c298600be7c2d… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #2473 from martenson/port-value-to-display [16.04] Avoid empty strings when converting values to display text Commit: 66e4750589db3e05163ad47323e6aee9ed7a2d4c https://github.com/galaxyproject/galaxy/commit/66e4750589db3e05163ad47323e6… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M templates/webapps/galaxy/workflow/display.mako Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/27a2a36657ae...66e4750589db

1 0

[galaxyproject/galaxy] 4cd2af: Avoid empty strings when converting values to disp...
by GitHub 08 Jun '16

08 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 4cd2af860ffc31ee574e6f81c941840ae603efe5 https://github.com/galaxyproject/galaxy/commit/4cd2af860ffc31ee574e6f81c941… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Avoid empty strings when converting values to display text Commit: 04863c833bb1de9c298600be7c2de44d2b6b694b https://github.com/galaxyproject/galaxy/commit/04863c833bb1de9c298600be7c2d… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #2473 from martenson/port-value-to-display [16.04] Avoid empty strings when converting values to display text Compare: https://github.com/galaxyproject/galaxy/compare/befe35456a60...04863c833bb1

1 0