| Previous changeset 5:d63739222f68 (2021-05-23) Next changeset 7:51c2360aa807 (2021-06-28) |
|
Commit message:
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/meryl commit 719ee1a23c0177886977f519f03c4032b97260b3" |
|
modified:
macros.xml meryl.xml |
| b |
| diff -r d63739222f68 -r 31fa26c0692b macros.xml --- a/macros.xml Sun May 23 18:09:41 2021 +0000 +++ b/macros.xml Tue Jun 08 07:20:29 2021 +0000 |
| b |
| @@ -1,6 +1,6 @@ <macros> <token name="@TOOL_VERSION@">1.3</token> - <token name="@GALAXY_TOOL_VERSION@">galaxy1</token> + <token name="@GALAXY_TOOL_VERSION@">galaxy2</token> <xml name="edam_ontology"> <edam_topics> <edam_topic>topic_0196</edam_topic> |
| b |
| diff -r d63739222f68 -r 31fa26c0692b meryl.xml --- a/meryl.xml Sun May 23 18:09:41 2021 +0000 +++ b/meryl.xml Tue Jun 08 07:20:29 2021 +0000 |
| b |
| b'@@ -49,16 +49,12 @@\n output read-db.meryl &&\n tar -zcf read-db.meryldb read-db.meryl\n #elif $operation_type.command_type == \'groups-kmers\'\n- mkdir -p ./temp_db/ &&\n- tar -zxf $operation_type.input_meryldb_02 -C ./temp_db/ &&\n- mv ./temp_db/* tmp_01.meryl &&\n- tar -zxf $operation_type.input_meryldb_03 -C ./temp_db/ &&\n- mv ./temp_db/* tmp_02.meryl &&\n- meryl\n- $operation_type.groups_operations\n- tmp_01.meryl\n- tmp_02.meryl\n- output read-db.meryl &&\n+ #for $i,$mdb in enumerate($operation_type.input_meryldb_02)\n+ mkdir -p ./tmp_folder_$i/ &&\n+ tar -zxf $mdb -C ./tmp_folder_$i &&\n+ mv ./tmp_folder_$i/* db_\'${i}\'.meryl &&\n+ #end for\n+ meryl $operation_type.groups_operations output read-db.meryl db_* &&\n tar -zcf read-db.meryldb read-db.meryl\n #elif $operation_type.command_type == \'histogram-kmers\'\n mkdir -p ./temp_db/ &&\n@@ -220,8 +216,7 @@\n <option value="difference">Difference: return k-mers that occur in the first input, but none of the other inputs</option>\n <option value="symmetric-difference">Symmetric-difference: return k-mers that occur in exactly one input</option>\n </param>\n- <param name="input_meryldb_02" type="data" format="meryldb" label="Input meryldb" />\n- <param name="input_meryldb_03" type="data" format="meryldb" label="Input meryldb" />\n+ <param name="input_meryldb_02" type="data" multiple="true" format="meryldb" label="Input meryldb" />\n </when>\n <when value="histogram-kmers">\n <param name="input_meryldb_02" type="data" format="meryldb" label="Input meryldb" />\n@@ -450,8 +445,8 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="union" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_03" value="" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -463,8 +458,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="union-min" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -476,8 +470,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="union-max" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -489,8 +482,7 @@\n <conditional name="operation_type">\n '..b'e="read_db" ftype="meryldb">\n <assert_contents>\n@@ -515,8 +506,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="intersect-min" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -528,8 +518,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="intersect-max" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -541,8 +530,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="intersect-sum" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -555,8 +543,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="subtract" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -568,8 +555,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="difference" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n@@ -581,8 +567,7 @@\n <conditional name="operation_type">\n <param name="command_type" value="groups-kmers" />\n <param name="groups_operations" value="symmetric-difference" />\n- <param name="input_meryldb_02" value="output_02.read-db.meryldb" ftype="meryldb" />\n- <param name="input_meryldb_03" value="output_03.read-db.meryldb" ftype="meryldb" />\n+ <param name="input_meryldb_02" value="output_02.read-db.meryldb,output_03.read-db.meryldb" ftype="meryldb" />\n </conditional>\n <output name="read_db" ftype="meryldb">\n <assert_contents>\n' |