Skip to content

Commit 9d10b45

Browse files
mvdbeekmvdbeek
authored
Merge pull request #1144 from SantaMcCloud/update_arm_gene_wf
updade amr_gene_detection to 1.1.8
2 parents 9e82dc8 + 0e6eb98 commit 9d10b45

File tree

3 files changed

+166
-48
lines changed

3 files changed

+166
-48
lines changed

‎workflows/bacterial_genomics/amr_gene_detection/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [1.1.8] 2026-03-15
4+
5+
- added MultiQC to collect all tabular files and create a HTML report of them
6+
- added a column regex operation to remove the ignore sign of ABRicate output header to make it usable for MulitQC
7+
38
## [1.1.7] 2025-12-01
49

510
### Automatic update

‎workflows/bacterial_genomics/amr_gene_detection/amr_gene_detection-tests.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,9 @@
7070
text: "pointfinder_file"
7171
- that: "has_text"
7272
text: "LINCOSAMIDE"
73+
multiqc_html_report:
74+
asserts:
75+
- that: has_text
76+
text: "ABRicate virulence"
77+
- that: has_text
78+
text: "Staramr detailed summary"

‎workflows/bacterial_genomics/amr_gene_detection/amr_gene_detection.ga‎

Lines changed: 155 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,7 @@
9090
"type": "parameter_input",
9191
"uuid": "f9a2fabf-4c0a-4ff2-8588-30ca77501dce",
9292
"when": null,
93-
"workflow_outputs": [
94-
{
95-
"label": null,
96-
"output_name": "output",
97-
"uuid": "32da2b40-db44-461c-b6d8-c00ab2ac96ac"
98-
}
99-
]
93+
"workflow_outputs": []
10094
},
10195
"2": {
10296
"annotation": "Select species for point mutation analysis using PointFinder database",
@@ -123,13 +117,7 @@
123117
"type": "parameter_input",
124118
"uuid": "ef73bbee-433b-41fb-a20f-a9d6937ef94f",
125119
"when": null,
126-
"workflow_outputs": [
127-
{
128-
"label": null,
129-
"output_name": "output",
130-
"uuid": "f626cf2d-76ef-4cf9-b20f-e6809e59f4ee"
131-
}
132-
]
120+
"workflow_outputs": []
133121
},
134122
"3": {
135123
"annotation": "Select the database to identify resistance-associated point mutations with AMRFinderPlus.",
@@ -156,13 +144,7 @@
156144
"type": "parameter_input",
157145
"uuid": "b2116f39-b5bb-48bb-b346-f7688a6ad908",
158146
"when": null,
159-
"workflow_outputs": [
160-
{
161-
"label": null,
162-
"output_name": "output",
163-
"uuid": "9f15c1cb-3145-4c24-b2c7-08a835efc56f"
164-
}
165-
]
147+
"workflow_outputs": []
166148
},
167149
"4": {
168150
"annotation": "Select the database to identify AMR genes with AMRFinderPlus.",
@@ -189,13 +171,7 @@
189171
"type": "parameter_input",
190172
"uuid": "dc226880-eb76-4588-a823-6ed24e0947ab",
191173
"when": null,
192-
"workflow_outputs": [
193-
{
194-
"label": null,
195-
"output_name": "output",
196-
"uuid": "8daa41ef-ec89-45e2-a9c5-1279a8f1e0f1"
197-
}
198-
]
174+
"workflow_outputs": []
199175
},
200176
"5": {
201177
"annotation": "Select the database to identify virulence genes with ABRicate.",
@@ -222,13 +198,7 @@
222198
"type": "parameter_input",
223199
"uuid": "5777ef56-176c-46f8-a597-9b5c3cc30666",
224200
"when": null,
225-
"workflow_outputs": [
226-
{
227-
"label": null,
228-
"output_name": "output",
229-
"uuid": "69305014-cf62-46a9-b2c9-29c5ab07a8d4"
230-
}
231-
]
201+
"workflow_outputs": []
232202
},
233203
"6": {
234204
"annotation": "staramr_amr_genes",
@@ -435,6 +405,7 @@
435405
"tool_shed": "toolshed.g2.bx.psu.edu"
436406
},
437407
"tool_state": "{\"advanced\": {\"pid_threshold\": \"90.0\", \"percent_length_overlap_resfinder\": \"60.0\", \"percent_length_overlap_pointfinder\": \"95.0\", \"percent_length_overlap_plasmidfinder\": \"60.0\", \"genome_size_lower_bound\": \"4000000\", \"genome_size_upper_bound\": \"6000000\", \"minimum_N50_value\": \"10000\", \"minimum_contig_length\": \"300\", \"unacceptable_number_contigs\": \"1000\", \"report_all_blast\": false, \"exclude_negatives\": false, \"exclude_resistance_phenotypes\": false, \"mlst_scheme\": \"auto\", \"exclude_genes\": {\"exclude_genes_condition\": \"default\", \"__current_case__\": 0}, \"complex_mutations_file\": {\"__class__\": \"RuntimeValue\"}, \"plasmidfinder_type\": \"include_all\"}, \"genomes\": {\"__class__\": \"ConnectedValue\"}, \"hide_db_build\": \"\", \"output_files\": {\"output_selection\": [\"mlst_table\", \"summary_table\", \"detailed_summary_table\", \"resfinder_table\", \"plasmidfinder_table\", \"pointfinder_table\", \"settings_output\", \"excel_output\"]}, \"pointfinder_organism\": {\"__class__\": \"ConnectedValue\"}, \"staramr_db_select\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": 0, \"__rerun_remap_job_id__\": null}",
408+
"tool_uuid": null,
438409
"tool_version": "0.11.0+galaxy3",
439410
"type": "tool",
440411
"uuid": "2064188a-099d-493e-b8f3-009bec482010",
@@ -563,6 +534,7 @@
563534
"tool_shed": "toolshed.g2.bx.psu.edu"
564535
},
565536
"tool_state": "{\"input_option\": {\"amrfinder_db_select\": {\"__class__\": \"ConnectedValue\"}, \"input_mode\": {\"input_select\": \"nucleotide\", \"__current_case__\": 0, \"nucleotide_input\": {\"__class__\": \"ConnectedValue\"}, \"nucleotide_flank5_size\": \"0\"}}, \"options\": {\"ident_min\": \"-1.0\", \"coverage_min\": \"0.5\", \"translation_table\": \"11\", \"plus\": true, \"report_all_equal\": true, \"print_node\": true, \"name\": null}, \"organism_options\": {\"organism_conditionnal\": {\"organism_select\": \"add_organism\", \"__current_case__\": 0, \"organism\": {\"__class__\": \"ConnectedValue\"}, \"mutation_all\": true, \"report_common\": true}}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
537+
"tool_uuid": null,
566538
"tool_version": "3.12.8+galaxy0",
567539
"type": "tool",
568540
"uuid": "3d2100c6-3604-4a81-b0fb-b9fe892d6837",
@@ -615,8 +587,8 @@
615587
}
616588
],
617589
"position": {
618-
"left": 885.033177397046,
619-
"top": 418.3886430778367
590+
"left": 896.9776795276849,
591+
"top": 435.8350732453179
620592
},
621593
"post_job_actions": {
622594
"RenameDatasetActionreport": {
@@ -636,12 +608,13 @@
636608
},
637609
"tool_id": "toolshed.g2.bx.psu.edu/repos/iuc/abricate/abricate/1.0.1",
638610
"tool_shed_repository": {
639-
"changeset_revision": "c2ef298da409",
611+
"changeset_revision": "3f3e247c053d",
640612
"name": "abricate",
641613
"owner": "iuc",
642614
"tool_shed": "toolshed.g2.bx.psu.edu"
643615
},
644616
"tool_state": "{\"adv\": {\"db\": {\"__class__\": \"ConnectedValue\"}, \"no_header\": false, \"min_dna_id\": \"80.0\", \"min_cov\": \"80.0\"}, \"file_input\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
617+
"tool_uuid": null,
645618
"tool_version": "1.0.1",
646619
"type": "tool",
647620
"uuid": "53f1d92c-33de-4e75-aff3-e3f199256cdf",
@@ -655,10 +628,55 @@
655628
]
656629
},
657630
"9": {
631+
"annotation": "",
632+
"content_id": "toolshed.g2.bx.psu.edu/repos/galaxyp/regex_find_replace/regexColumn1/1.0.3",
633+
"errors": null,
634+
"id": 9,
635+
"input_connections": {
636+
"input": {
637+
"id": 8,
638+
"output_name": "report"
639+
}
640+
},
641+
"inputs": [
642+
{
643+
"description": "runtime parameter for tool Column Regex Find And Replace",
644+
"name": "input"
645+
}
646+
],
647+
"label": null,
648+
"name": "Column Regex Find And Replace",
649+
"outputs": [
650+
{
651+
"name": "out_file1",
652+
"type": "input"
653+
}
654+
],
655+
"position": {
656+
"left": 1160.4702521427355,
657+
"top": 501.31530292042527
658+
},
659+
"post_job_actions": {},
660+
"tool_id": "toolshed.g2.bx.psu.edu/repos/galaxyp/regex_find_replace/regexColumn1/1.0.3",
661+
"tool_shed_repository": {
662+
"changeset_revision": "503bcd6ebe4b",
663+
"name": "regex_find_replace",
664+
"owner": "galaxyp",
665+
"tool_shed": "toolshed.g2.bx.psu.edu"
666+
},
667+
"tool_state": "{\"checks\": [{\"__index__\": 0, \"pattern\": \"#FILE\", \"replacement\": \"FILE\"}], \"field\": \"1\", \"input\": {\"__class__\": \"RuntimeValue\"}, \"__page__\": 0, \"__rerun_remap_job_id__\": null}",
668+
"tool_uuid": null,
669+
"tool_version": "1.0.3",
670+
"type": "tool",
671+
"uuid": "a63066ff-876e-4086-9ff2-d537fe1e3658",
672+
"when": null,
673+
"workflow_outputs": []
674+
},
675+
"10": {
658676
"annotation": "ToolDistillator extracts results from tools and creates a JSON file for each tool",
659677
"content_id": "toolshed.g2.bx.psu.edu/repos/iuc/tooldistillator/tooldistillator/1.0.4+galaxy0",
660678
"errors": null,
661-
"id": 9,
679+
"id": 10,
662680
"input_connections": {
663681
"tool_section|tools_0|select_tool|input": {
664682
"id": 8,
@@ -715,8 +733,8 @@
715733
}
716734
],
717735
"position": {
718-
"left": 1138.6692404030955,
719-
"top": 661.2511784209886
736+
"left": 1369.9595468127886,
737+
"top": 650.8281443642051
720738
},
721739
"post_job_actions": {
722740
"RenameDatasetActionoutput_json": {
@@ -742,6 +760,7 @@
742760
"tool_shed": "toolshed.g2.bx.psu.edu"
743761
},
744762
"tool_state": "{\"log\": false, \"tool_section\": {\"tools\": [{\"__index__\": 0, \"select_tool\": {\"tool_list\": \"abricate\", \"__current_case__\": 0, \"input\": {\"__class__\": \"ConnectedValue\"}, \"origin\": {\"origin\": \"false\", \"__current_case__\": 1}, \"reference_database_version\": {\"__class__\": \"ConnectedValue\"}}}, {\"__index__\": 1, \"select_tool\": {\"tool_list\": \"staramr\", \"__current_case__\": 37, \"input\": {\"__class__\": \"ConnectedValue\"}, \"mlst_file_path\": {\"__class__\": \"ConnectedValue\"}, \"plasmidfinder_file_path\": {\"__class__\": \"RuntimeValue\"}, \"pointfinder_file_path\": {\"__class__\": \"ConnectedValue\"}, \"setting_file_path\": {\"__class__\": \"ConnectedValue\"}, \"origin\": {\"origin\": \"false\", \"__current_case__\": 1}, \"reference_database_version\": {\"__class__\": \"ConnectedValue\"}}}, {\"__index__\": 2, \"select_tool\": {\"tool_list\": \"amrfinderplus\", \"__current_case__\": 1, \"input\": {\"__class__\": \"ConnectedValue\"}, \"point_mutation_report_path\": {\"__class__\": \"ConnectedValue\"}, \"nucleotide_sequence_path\": {\"__class__\": \"ConnectedValue\"}, \"origin\": {\"origin\": \"false\", \"__current_case__\": 1}, \"reference_database_version\": {\"__class__\": \"ConnectedValue\"}}}]}, \"__page__\": 0, \"__rerun_remap_job_id__\": null}",
763+
"tool_uuid": null,
745764
"tool_version": "1.0.4+galaxy0",
746765
"type": "tool",
747766
"uuid": "edaa1551-44b3-4714-a249-fd44f35cc370",
@@ -754,14 +773,101 @@
754773
}
755774
]
756775
},
757-
"10": {
776+
"11": {
777+
"annotation": "",
778+
"content_id": "toolshed.g2.bx.psu.edu/repos/iuc/multiqc/multiqc/1.33+galaxy0",
779+
"errors": null,
780+
"id": 11,
781+
"input_connections": {
782+
"results_0|software_cond|input": {
783+
"id": 6,
784+
"output_name": "detailed_summary"
785+
},
786+
"results_1|software_cond|input": {
787+
"id": 6,
788+
"output_name": "resfinder"
789+
},
790+
"results_2|software_cond|input": {
791+
"id": 6,
792+
"output_name": "plasmidfinder"
793+
},
794+
"results_3|software_cond|input": {
795+
"id": 6,
796+
"output_name": "pointfinder"
797+
},
798+
"results_4|software_cond|input": {
799+
"id": 7,
800+
"output_name": "amrfinderplus_report"
801+
},
802+
"results_5|software_cond|input": {
803+
"id": 7,
804+
"output_name": "mutation_all_report"
805+
},
806+
"results_6|software_cond|input": {
807+
"id": 9,
808+
"output_name": "out_file1"
809+
}
810+
},
811+
"inputs": [
812+
{
813+
"description": "runtime parameter for tool MultiQC",
814+
"name": "image_content_input"
815+
}
816+
],
817+
"label": null,
818+
"name": "MultiQC",
819+
"outputs": [
820+
{
821+
"name": "html_report",
822+
"type": "html"
823+
},
824+
{
825+
"name": "stats",
826+
"type": "tabular"
827+
}
828+
],
829+
"position": {
830+
"left": 1467.7344906405215,
831+
"top": 216.01291805145792
832+
},
833+
"post_job_actions": {
834+
"TagDatasetActionhtml_report": {
835+
"action_arguments": {
836+
"tags": "multiqc_html_report"
837+
},
838+
"action_type": "TagDatasetAction",
839+
"output_name": "html_report"
840+
}
841+
},
842+
"tool_id": "toolshed.g2.bx.psu.edu/repos/iuc/multiqc/multiqc/1.33+galaxy0",
843+
"tool_shed_repository": {
844+
"changeset_revision": "26ee5e11ecbe",
845+
"name": "multiqc",
846+
"owner": "iuc",
847+
"tool_shed": "toolshed.g2.bx.psu.edu"
848+
},
849+
"tool_state": "{\"comment\": \"\", \"export\": false, \"flat\": false, \"image_content_input\": {\"__class__\": \"RuntimeValue\"}, \"png_plots\": false, \"results\": [{\"__index__\": 0, \"software_cond\": {\"software\": \"custom_content\", \"__current_case__\": 48, \"plot_type\": \"table\", \"section_name\": \"Staramr detailed summary\", \"title\": null, \"description\": null, \"xlab\": null, \"ylab\": null, \"input\": {\"__class__\": \"RuntimeValue\"}}}, {\"__index__\": 1, \"software_cond\": {\"software\": \"custom_content\", \"__current_case__\": 48, \"plot_type\": \"table\", \"section_name\": \"Staramr resfinder\", \"title\": null, \"description\": null, \"xlab\": null, \"ylab\": null, \"input\": {\"__class__\": \"RuntimeValue\"}}}, {\"__index__\": 2, \"software_cond\": {\"software\": \"custom_content\", \"__current_case__\": 48, \"plot_type\": \"table\", \"section_name\": \"Staramr plasmidfinder\", \"title\": null, \"description\": null, \"xlab\": null, \"ylab\": null, \"input\": {\"__class__\": \"RuntimeValue\"}}}, {\"__index__\": 3, \"software_cond\": {\"software\": \"custom_content\", \"__current_case__\": 48, \"plot_type\": \"table\", \"section_name\": \"Staramr pointfinder \", \"title\": null, \"description\": null, \"xlab\": null, \"ylab\": null, \"input\": {\"__class__\": \"RuntimeValue\"}}}, {\"__index__\": 4, \"software_cond\": {\"software\": \"custom_content\", \"__current_case__\": 48, \"plot_type\": \"table\", \"section_name\": \"AMRFinderPlus report\", \"title\": null, \"description\": null, \"xlab\": null, \"ylab\": null, \"input\": {\"__class__\": \"RuntimeValue\"}}}, {\"__index__\": 5, \"software_cond\": {\"software\": \"custom_content\", \"__current_case__\": 48, \"plot_type\": \"table\", \"section_name\": \"ARMFinderPlus mutation\", \"title\": null, \"description\": null, \"xlab\": null, \"ylab\": null, \"input\": {\"__class__\": \"RuntimeValue\"}}}, {\"__index__\": 6, \"software_cond\": {\"software\": \"custom_content\", \"__current_case__\": 48, \"plot_type\": \"table\", \"section_name\": \"ABRicate virulence\", \"title\": null, \"description\": null, \"xlab\": null, \"ylab\": null, \"input\": {\"__class__\": \"RuntimeValue\"}}}], \"title\": \"\", \"__page__\": 0, \"__rerun_remap_job_id__\": null}",
850+
"tool_uuid": null,
851+
"tool_version": "1.33+galaxy0",
852+
"type": "tool",
853+
"uuid": "fe04fa42-4566-45a5-8a3e-065425c80dfa",
854+
"when": null,
855+
"workflow_outputs": [
856+
{
857+
"label": "multiqc_html_report",
858+
"output_name": "multiqc_html_report",
859+
"uuid": "4ac5518b-f96f-437e-bc48-909c7d457144"
860+
}
861+
]
862+
},
863+
"12": {
758864
"annotation": "ToolDistillator summarize groups all JSON file into a unique JSON file",
759865
"content_id": "toolshed.g2.bx.psu.edu/repos/iuc/tooldistillator_summarize/tooldistillator_summarize/1.0.4+galaxy0",
760866
"errors": null,
761-
"id": 10,
867+
"id": 12,
762868
"input_connections": {
763869
"summarize_data": {
764-
"id": 9,
870+
"id": 10,
765871
"output_name": "output_json"
766872
}
767873
},
@@ -775,8 +881,8 @@
775881
}
776882
],
777883
"position": {
778-
"left": 1510.406873337906,
779-
"top": 911.3969486227988
884+
"left": 1701.4455227163824,
885+
"top": 911.3906299568054
780886
},
781887
"post_job_actions": {
782888
"RenameDatasetActionsummary_json": {
@@ -802,6 +908,7 @@
802908
"tool_shed": "toolshed.g2.bx.psu.edu"
803909
},
804910
"tool_state": "{\"summarize_data\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": 0, \"__rerun_remap_job_id__\": null}",
911+
"tool_uuid": null,
805912
"tool_version": "1.0.4+galaxy0",
806913
"type": "tool",
807914
"uuid": "7b4072b0-8d8c-40ad-999b-d98eafcdccd4",
@@ -826,7 +933,7 @@
826933
"AMR",
827934
"AMR-detection"
828935
],
829-
"uuid": "284cc748-7532-4749-8f68-d19d41c048ef",
936+
"uuid": "e3da62ad-1fb2-4a4d-bd2a-0747af49ef8d",
830937
"version": 1,
831-
"release": "1.1.7"
938+
"release": "1.1.8"
832939
}

0 commit comments

Comments
 (0)