diff macros.xml @ 7:e403d27e8f24 draft

"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/rgrnastar commit a8e319862d723654c372a6d71e5de76e052586a9"

--- a/macros.xml	Thu Nov 28 15:55:47 2019 -0500
+++ b/macros.xml	Wed Aug 05 09:41:22 2020 -0400
@@ -5,7 +5,7 @@
     the index versions in sync, but you should manually adjust the +galaxy
     version number. -->
     <!-- STAR version to be used -->
-    <token name="@VERSION@">2.7.2b</token>
+    <token name="@VERSION@">2.7.5b</token>
     <!-- STAR index version compatible with this version of STAR
     This is the STAR version that introduced the index structure expected
     by the current version.
@@ -13,7 +13,8 @@
     STAR -h | grep versionGenome
     or by looking for the versionGenome parameter in source/parametersDefault
     of STAR's source code -->
-    <token name="@IDX_VERSION@">2.7.1a</token>
+    <token name="@IDX_VERSION@">2.7.4a</token>
+    <token name="@IDX_DATA_TABLE@">rnastar_index2x_versioned</token>
 
     <xml name="requirements">
         <requirements>
@@ -27,7 +28,7 @@
         <param argument="--genomeDir" name="genomeDir" type="select"
         label="Select reference genome"
         help="If your genome of interest is not listed, contact the Galaxy team">
-            <options from_data_table="rnastar_index2_versioned">
+            <options from_data_table="@IDX_DATA_TABLE@">
                 <filter type="static_value" column="4" value="@WITH_GENE_MODEL@" />
                 <filter type="static_value" column="5" value="@IDX_VERSION@" />
                 <filter type="sort_by" column="2" />
@@ -53,7 +54,7 @@
             <conditional name="refGenomeSource.geneSource">
                 <when value="indexed">
                     <action type="metadata" name="dbkey">
-                        <option type="from_data_table" name="rnastar_index2_versioned" column="1" offset="0">
+                        <option type="from_data_table" name="@IDX_DATA_TABLE@" column="1" offset="0">
                             <filter type="param_value" column="0" value="#" compare="startswith" keep="False"/>
                             <filter type="param_value" ref="refGenomeSource.GTFconditional.genomeDir" column="0"/>
                         </option>
@@ -76,10 +77,21 @@
             --genomeDir 'tempstargenomedir'
             --genomeFastaFiles '${refGenomeSource.genomeFastaFiles}'
             ## Handle difference between indices with/without annotations
-            #if str($refGenomeSource.GTFconditional.GTFselect) == 'with-gtf':
-                --sjdbOverhang '${refGenomeSource.GTFconditional.sjdbOverhang}'
-                --sjdbGTFfile '${refGenomeSource.GTFconditional.sjdbGTFfile}'
-                #if str($refGenomeSource.GTFconditional.sjdbGTFfile.ext) == 'gff3':
+            #if 'GTFconditional' in $refGenomeSource:
+                ## GTFconditional exists only in STAR, but not STARsolo
+                #if str($refGenomeSource.GTFconditional.GTFselect) == 'with-gtf':
+                    --sjdbOverhang '${refGenomeSource.GTFconditional.sjdbOverhang}'
+                    --sjdbGTFfile '${refGenomeSource.GTFconditional.sjdbGTFfile}'
+                    #if str($refGenomeSource.GTFconditional.sjdbGTFfile.ext) == 'gff3':
+                        --sjdbGTFtagExonParentTranscript Parent
+                    #end if
+                #end if
+            #else:
+                ## ref genome selection is less complex for STARsolo cause
+                ## with-gtf is mandatory there
+                --sjdbOverhang '${refGenomeSource.sjdbOverhang}'
+                --sjdbGTFfile '${refGenomeSource.sjdbGTFfile}'
+                #if str($refGenomeSource.sjdbGTFfile.ext) == 'gff3':
                     --sjdbGTFtagExonParentTranscript Parent
                 #end if
             #end if
@@ -110,6 +122,13 @@
         #end if
         #end if
         ]]></token>
+    <xml name="ref_selection">
+        <param argument="--genomeFastaFiles" type="data" format="fasta" label="Select a reference genome" />
+        <!-- Currently, this parameter is not exposed in the wrapper,
+             but used only in the tests to avoid excessive index sizes for
+             the tiny test genomes. -->
+        <param name="genomeSAindexNbases" type="hidden" value="" />
+    </xml>
     <xml name="stdio" >
         <stdio>
             <regex match="FATAL error" source="both" level="fatal"/>
@@ -119,48 +138,4 @@
             <yield />
         </stdio>
     </xml>
-    <xml name="refgenomehandling" >
-        <conditional name="refGenomeSource">
-            <param name="geneSource" type="select" label="Custom or built-in reference genome" help="Built-ins were indexed using default options">
-                <option value="indexed" selected="true">Use a built-in index</option>
-                <option value="history">Use reference genome from history and create temporary index</option>
-            </param>
-            <when value="indexed">
-                <conditional name="GTFconditional">
-                    <param name="GTFselect" type="select"
-                           label="Reference genome with or without an annotation"
-                           help="Select the '... with builtin gene-model' option to select from the list of available indexes that were built with splice junction information. Select the '... without builtin gene-model' option to select from the list of available indexes without annotated splice junctions.">
-                        <option value="without-gtf" selected='true'>use genome reference without builtin gene-model</option>
-                        <option value="with-gtf">use genome reference with builtin gene-model</option>
-                    </param>
-                    <when value="with-gtf">
-                        <expand macro="index_selection" with_gene_model="1" />
-                    </when>
-                    <when value="without-gtf">
-                        <expand macro="index_selection" with_gene_model="0" />
-                        <expand macro="@SJDBOPTIONS@" />
-                    </when>
-                </conditional>
-            </when>
-            <when value="history">
-                <param argument="--genomeFastaFiles" type="data" format="fasta" label="Select a reference genome" />
-                <!-- Currently, this parameter is not exposed in the wrapper,
-                     but used only in the tests to avoid excessive index sizes for
-                     the tiny test genomes. -->
-                <param name="genomeSAindexNbases" type="hidden" value="" />
-                <conditional name="GTFconditional">
-                    <param name="GTFselect" type="select"
-                           label="Build index with our without known splice junctions annotation"
-                           help="To build an index with known splice junctions annotated, you will have to provide a GTF or GFF3 dataset that describes the gene models (the location of genes, transcripts and exons) known for the reference genome.">
-                        <option value="without-gtf">build index without gene-model</option>
-                        <option value="with-gtf">build index with gene-model</option>
-                    </param>
-                    <when value="with-gtf">
-                        <expand macro="@SJDBOPTIONS@" optional="false"/>
-                    </when>
-                    <when value="without-gtf" />
-                </conditional>
-            </when>
-        </conditional>
-    </xml>
 </macros>