Skip to content

Commit

Permalink
update workflows and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@lldelisle
lldelisle committed Nov 12, 2024
1 parent 2208649 commit 0619a94
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 139 deletions.
124 changes: 48 additions & 76 deletions workflows/data-manipulation/split-collection/Split-collection-using-comma-separated-list.ga
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@
"name": "Split collection using tabular",
"outputs": [],
"position": {
"left": 1056.0418201104033,
"top": 153.98743551496034
"left": 1071,
"top": 151.5
},
"subworkflow": {
"a_galaxy_workflow": "true",
Expand Down Expand Up @@ -447,7 +447,7 @@
}
},
"inputs": [],
"label": "make filter condition",
"label": "make awk program",
"name": "Compose text parameter value",
"outputs": [
{
Expand All @@ -456,8 +456,8 @@
}
],
"position": {
"left": 869.1832700991363,
"top": 358.015694923965
"left": 905.183349609375,
"top": 343.01666259765625
},
"post_job_actions": {
"HideDatasetActionout1": {
Expand All @@ -473,7 +473,7 @@
"owner": "iuc",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"components\": [{\"__index__\": 0, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"c2 == \\\"\"}}, {\"__index__\": 1, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": {\"__class__\": \"ConnectedValue\"}}}, {\"__index__\": 2, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"\\\"\"}}], \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_state": "{\"components\": [{\"__index__\": 0, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"$2==\\\"\"}}, {\"__index__\": 1, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": {\"__class__\": \"ConnectedValue\"}}}, {\"__index__\": 2, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"\\\"{print $1}\"}}], \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "0.1.1",
"type": "tool",
"uuid": "72928cef-e147-45c0-866e-d3bdc5d82937",
Expand All @@ -482,95 +482,67 @@
},
"5": {
"annotation": "",
"content_id": "Filter1",
"content_id": "toolshed.g2.bx.psu.edu/repos/bgruening/text_processing/tp_awk_tool/9.3+galaxy1",
"errors": null,
"id": 5,
"input_connections": {
"cond": {
"code": {
"id": 4,
"output_name": "out1"
},
"input": {
"infile": {
"id": 1,
"output_name": "output"
}
},
"inputs": [],
"label": "filter tabular to get only lines with first group",
"name": "Filter",
"outputs": [
"inputs": [
{
"name": "out_file1",
"type": "input"
"description": "runtime parameter for tool Text reformatting",
"name": "infile"
}
],
"position": {
"left": 1094.6521773218315,
"top": 312.3648800009677
},
"post_job_actions": {
"HideDatasetActionout_file1": {
"action_arguments": {},
"action_type": "HideDatasetAction",
"output_name": "out_file1"
}
},
"tool_id": "Filter1",
"tool_state": "{\"cond\": {\"__class__\": \"ConnectedValue\"}, \"header_lines\": \"0\", \"input\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "1.1.1",
"type": "tool",
"uuid": "f07fefb8-f736-4d02-8f7f-8467735c760c",
"when": null,
"workflow_outputs": []
},
"6": {
"annotation": "",
"content_id": "Cut1",
"errors": null,
"id": 6,
"input_connections": {
"input": {
"id": 5,
"output_name": "out_file1"
}
},
"inputs": [],
"label": "keep only identifiers",
"name": "Cut",
"label": "get only identifiers with first group",
"name": "Text reformatting",
"outputs": [
{
"name": "out_file1",
"type": "tabular"
"name": "outfile",
"type": "input"
}
],
"position": {
"left": 1345.2875324397519,
"top": 323.498696348884
"left": 1224,
"top": 298.5
},
"post_job_actions": {
"HideDatasetActionout_file1": {
"HideDatasetActionoutfile": {
"action_arguments": {},
"action_type": "HideDatasetAction",
"output_name": "out_file1"
"output_name": "outfile"
}
},
"tool_id": "Cut1",
"tool_state": "{\"__input_ext\": \"tabular\", \"chromInfo\": \"/opt/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"columnList\": \"c1\", \"delimiter\": \"T\", \"input\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "1.0.2",
"tool_id": "toolshed.g2.bx.psu.edu/repos/bgruening/text_processing/tp_awk_tool/9.3+galaxy1",
"tool_shed_repository": {
"changeset_revision": "86755160afbf",
"name": "text_processing",
"owner": "bgruening",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"code\": {\"__class__\": \"ConnectedValue\"}, \"infile\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "9.3+galaxy1",
"type": "tool",
"uuid": "364f21f7-fc99-4ad3-aa03-5379abeaa91d",
"uuid": "904fd1c2-cbc6-45c2-b4d7-d8e72b07d5cf",
"when": null,
"workflow_outputs": []
},
"7": {
"6": {
"annotation": "",
"content_id": "__FILTER_FROM_FILE__",
"errors": null,
"id": 7,
"id": 6,
"input_connections": {
"how|filter_source": {
"id": 6,
"output_name": "out_file1"
"id": 5,
"output_name": "outfile"
},
"input": {
"id": 0,
Expand Down Expand Up @@ -622,41 +594,41 @@
"uuid": "8ff72610-8349-4862-b66e-1416e40ff95a",
"when": null,
"workflow_outputs": [
{
"label": "collection_first_group",
"output_name": "output_filtered",
"uuid": "32af9f5d-c3f1-437a-8b08-6032212dd277"
},
{
"label": "collection_other",
"output_name": "output_discarded",
"uuid": "d8721c45-506c-4378-95fc-a951cd854fc5"
},
{
"label": "collection_first_group",
"output_name": "output_filtered",
"uuid": "32af9f5d-c3f1-437a-8b08-6032212dd277"
}
]
}
},
"tags": [],
"uuid": "11bb0822-24d7-4e26-adc8-2f389dddae88"
"uuid": "f3a5e3f5-f2ce-4dde-aa36-6d39c8d37855"
},
"tool_id": null,
"type": "subworkflow",
"uuid": "6bb1b0b5-802d-4eed-b18e-2d3769f90c07",
"uuid": "eadd9f06-55d3-49db-b1e2-02550196540a",
"when": null,
"workflow_outputs": [
{
"label": "collection_other",
"output_name": "collection_other",
"uuid": "508ac256-3c68-4024-83d4-d2966f7b2fa6"
},
{
"label": "collection_first_group",
"output_name": "collection_first_group",
"uuid": "99c02ccc-4c97-4d80-a112-513a260832fa"
"uuid": "cc55d416-fed3-4a69-9ce3-a33ea9ca62bf"
},
{
"label": "collection_other",
"output_name": "collection_other",
"uuid": "f432b663-fb45-426c-b890-84062087db44"
}
]
}
},
"tags": [],
"uuid": "cb0eeee3-59c5-48c7-b14a-c66826ec2f93",
"uuid": "71ae6dd8-b4e7-419d-83d5-9cd25ca79d57",
"version": 2
}
2 changes: 1 addition & 1 deletion workflows/data-manipulation/split-collection/Split-collection-using-tabular-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
path: test-data/file.txt
identifier mapping:
class: File
path: group_asignment.txt
path: test-data/group_asignment.txt
datatype: tabular
outputs:
collection_other:
Expand Down
96 changes: 34 additions & 62 deletions workflows/data-manipulation/split-collection/Split-collection-using-tabular.ga
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
}
},
"inputs": [],
"label": "make filter condition",
"label": "make awk program",
"name": "Compose text parameter value",
"outputs": [
{
Expand All @@ -176,8 +176,8 @@
}
],
"position": {
"left": 869.1832700991363,
"top": 358.015694923965
"left": 905.183349609375,
"top": 343.01666259765625
},
"post_job_actions": {
"HideDatasetActionout1": {
Expand All @@ -193,7 +193,7 @@
"owner": "iuc",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"components\": [{\"__index__\": 0, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"c2 == \\\"\"}}, {\"__index__\": 1, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": {\"__class__\": \"ConnectedValue\"}}}, {\"__index__\": 2, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"\\\"\"}}], \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_state": "{\"components\": [{\"__index__\": 0, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"$2==\\\"\"}}, {\"__index__\": 1, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": {\"__class__\": \"ConnectedValue\"}}}, {\"__index__\": 2, \"param_type\": {\"select_param_type\": \"text\", \"__current_case__\": 0, \"component_value\": \"\\\"{print $1}\"}}], \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "0.1.1",
"type": "tool",
"uuid": "72928cef-e147-45c0-866e-d3bdc5d82937",
Expand All @@ -202,95 +202,67 @@
},
"5": {
"annotation": "",
"content_id": "Filter1",
"content_id": "toolshed.g2.bx.psu.edu/repos/bgruening/text_processing/tp_awk_tool/9.3+galaxy1",
"errors": null,
"id": 5,
"input_connections": {
"cond": {
"code": {
"id": 4,
"output_name": "out1"
},
"input": {
"infile": {
"id": 1,
"output_name": "output"
}
},
"inputs": [],
"label": "filter tabular to get only lines with first group",
"name": "Filter",
"outputs": [
"inputs": [
{
"name": "out_file1",
"type": "input"
"description": "runtime parameter for tool Text reformatting",
"name": "infile"
}
],
"position": {
"left": 1094.6521773218315,
"top": 312.3648800009677
},
"post_job_actions": {
"HideDatasetActionout_file1": {
"action_arguments": {},
"action_type": "HideDatasetAction",
"output_name": "out_file1"
}
},
"tool_id": "Filter1",
"tool_state": "{\"cond\": {\"__class__\": \"ConnectedValue\"}, \"header_lines\": \"0\", \"input\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "1.1.1",
"type": "tool",
"uuid": "f07fefb8-f736-4d02-8f7f-8467735c760c",
"when": null,
"workflow_outputs": []
},
"6": {
"annotation": "",
"content_id": "Cut1",
"errors": null,
"id": 6,
"input_connections": {
"input": {
"id": 5,
"output_name": "out_file1"
}
},
"inputs": [],
"label": "keep only identifiers",
"name": "Cut",
"label": "get only identifiers with first group",
"name": "Text reformatting",
"outputs": [
{
"name": "out_file1",
"type": "tabular"
"name": "outfile",
"type": "input"
}
],
"position": {
"left": 1345.2875324397519,
"top": 323.498696348884
"left": 1224,
"top": 298.5
},
"post_job_actions": {
"HideDatasetActionout_file1": {
"HideDatasetActionoutfile": {
"action_arguments": {},
"action_type": "HideDatasetAction",
"output_name": "out_file1"
"output_name": "outfile"
}
},
"tool_id": "Cut1",
"tool_state": "{\"__input_ext\": \"tabular\", \"chromInfo\": \"/opt/galaxy/tool-data/shared/ucsc/chrom/?.len\", \"columnList\": \"c1\", \"delimiter\": \"T\", \"input\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "1.0.2",
"tool_id": "toolshed.g2.bx.psu.edu/repos/bgruening/text_processing/tp_awk_tool/9.3+galaxy1",
"tool_shed_repository": {
"changeset_revision": "86755160afbf",
"name": "text_processing",
"owner": "bgruening",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"code\": {\"__class__\": \"ConnectedValue\"}, \"infile\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "9.3+galaxy1",
"type": "tool",
"uuid": "364f21f7-fc99-4ad3-aa03-5379abeaa91d",
"uuid": "904fd1c2-cbc6-45c2-b4d7-d8e72b07d5cf",
"when": null,
"workflow_outputs": []
},
"7": {
"6": {
"annotation": "",
"content_id": "__FILTER_FROM_FILE__",
"errors": null,
"id": 7,
"id": 6,
"input_connections": {
"how|filter_source": {
"id": 6,
"output_name": "out_file1"
"id": 5,
"output_name": "outfile"
},
"input": {
"id": 0,
Expand Down Expand Up @@ -356,6 +328,6 @@
}
},
"tags": [],
"uuid": "11bb0822-24d7-4e26-adc8-2f389dddae88",
"version": 3
"uuid": "f3a5e3f5-f2ce-4dde-aa36-6d39c8d37855",
"version": 4
}

0 comments on commit 0619a94

Please sign in to comment.