# HG changeset patch
# User bgruening
# Date 1761734719 0
# Node ID 244d10cb5fbe154b0b08937afa5c1ab4cbad41c5
# Parent d7346aaf11f4a216f8cc067dd56bddb46422f1a4
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/salmon commit 1971e35a365a91ae36c990b374a552a46196e888
diff -r d7346aaf11f4 -r 244d10cb5fbe macros.xml
--- a/macros.xml Fri Jun 23 17:01:09 2023 +0000
+++ b/macros.xml Wed Oct 29 10:45:19 2025 +0000
@@ -1,8 +1,13 @@
1.10.1
- 0
+ 3
q7
- 20.01
+ 24.1
+
+
+ salmon
+
+
salmon
@@ -14,8 +19,11 @@
scipy
+
+
+
-
+
@@ -23,7 +31,7 @@
-
+
@@ -63,7 +71,7 @@
-
+
@@ -73,14 +81,11 @@
@@ -90,75 +95,62 @@
-
-
-
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -171,152 +163,135 @@
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
10.1186/s13059-019-1670-y
@@ -327,26 +302,26 @@
" | cut -d " " -f 1 > 'decoys.txt' &&
+ #if $TRANSCRIPTSOURCE_CONDITIONAL.TranscriptSource != "indexed":
+ #if $TRANSCRIPTSOURCE_CONDITIONAL.s_index.genome
+ cat '${TRANSCRIPTSOURCE_CONDITIONAL.s_index.genome}' | grep "^>" | cut -d " " -f 1 > 'decoys.txt' &&
sed -i.bak -e 's/>//g' 'decoys.txt' &&
- cat '${quant_type.refTranscriptSource.s_index.fasta}' '${quant_type.refTranscriptSource.s_index.genome}' > 'input_index.fasta' &&
+ cat '${TRANSCRIPTSOURCE_CONDITIONAL.s_index.fasta}' '${TRANSCRIPTSOURCE_CONDITIONAL.s_index.genome}' > 'input_index.fasta' &&
#else
- ln -s '${quant_type.refTranscriptSource.s_index.fasta}' 'input_index.fasta' &&
+ ln -s '${TRANSCRIPTSOURCE_CONDITIONAL.s_index.fasta}' 'input_index.fasta' &&
#end if
- salmon index -i ./index
- --kmerLen '${quant_type.refTranscriptSource.s_index.kmer}'
+ salmon --no-version-check index -i ./index
+ --kmerLen '${TRANSCRIPTSOURCE_CONDITIONAL.s_index.kmer}'
--gencode
- --threads "\${GALAXY_SLOTS:-4}"
+ --threads "\$SLOTS"
--transcripts 'input_index.fasta'
- #if $quant_type.refTranscriptSource.s_index.genome
+ #if $TRANSCRIPTSOURCE_CONDITIONAL.s_index.genome
--decoy 'decoys.txt'
#end if
&&
#set $index_path = './index'
#else
- #set $index_path = $quant_type.refTranscriptSource.index.fields.path
+ #set $index_path = $TRANSCRIPTSOURCE_CONDITIONAL.index.fields.path
#end if
]]>
@@ -356,58 +331,33 @@
#if $quant_type.input.single_or_paired.input_singles.ext == 'fasta':
#set $ext = 'fasta'
#else:
- #if $quant_type.input.single_or_paired.input_singles.is_of_type("fastq.gz", "fastqsanger.gz"):
+ #if $quant_type.input.single_or_paired.input_singles.is_of_type("fastqsanger.gz"):
#set compressed = 'GZ'
- #else if $quant_type.input.single_or_paired.input_singles.is_of_type("fastq.bz2", "fastqsanger.bz2"):
+ #else if $quant_type.input.single_or_paired.input_singles.is_of_type("fastqsanger.bz2"):
#set compressed = 'BZ2'
#end if
#set $ext = 'fastq'
#end if
ln -s $quant_type.input.single_or_paired.input_singles ./single.$ext &&
- #else if $quant_type.input.single_or_paired.single_or_paired_opts == 'paired':
- #if $quant_type.input.single_or_paired.input_mate1.ext == 'fasta':
- #set $ext = 'fasta'
- #else:
- #if $quant_type.input.single_or_paired.input_mate1.is_of_type("fastq.gz", "fastqsanger.gz"):
- #set compressed = 'GZ'
- #else if $quant_type.input.single_or_paired.input_mate1.is_of_type("fastq.bz2", "fastqsanger.bz2"):
- #set compressed = 'BZ2'
- #end if
- #set $ext = 'fastq'
- #end if
- ln -s $quant_type.input.single_or_paired.input_mate1 ./mate1.$ext &&
- ln -s $quant_type.input.single_or_paired.input_mate2 ./mate2.$ext &&
#else if $quant_type.input.single_or_paired.single_or_paired_opts == 'paired_collection':
#if $quant_type.input.single_or_paired.input_1.forward.ext == 'fasta':
#set $ext = 'fasta'
#else:
- #if $quant_type.input.single_or_paired.input_1.forward.is_of_type("fastq.gz", "fastqsanger.gz"):
+ #if $quant_type.input.single_or_paired.input_1.forward.is_of_type("fastqsanger.gz"):
#set compressed = 'GZ'
- #else if $quant_type.input.single_or_paired.input_1.forward.is_of_type("fastq.bz2", "fastqsanger.bz2"):
+ #else if $quant_type.input.single_or_paired.input_1.forward.is_of_type("fastqsanger.bz2"):
#set compressed = 'BZ2'
#end if
#set $ext = 'fastq'
#end if
ln -s '${quant_type.input.single_or_paired.input_1.forward}' ./mate1.$ext &&
ln -s '${quant_type.input.single_or_paired.input_1.reverse}' ./mate2.$ext &&
- #else if '$quant_type.input.single_or_paired.single_or_paired_opts' == 'paired_interleaved':
- #if $quant_type.input.single_or_paired.input_1.ext == 'fasta':
- #set $ext = 'fasta'
- #else:
- #if $quant_type.input.single_or_paired.input_1.is_of_type("fastq.gz", "fastqsanger.gz"):
- #set compressed = 'GZ'
- #else if $quant_type.input.single_or_paired.input_1.is_of_type("fastq.bz2", "fastqsanger.bz2"):
- #set compressed = 'BZ2'
- #end if
- #set $ext = 'fastq'
- #end if
- ln -s '$quant_type.input.single_or_paired.input_1' ./mate1.$ext &&
#end if
#if $geneMap:
ln -s '$geneMap' ./geneMap.${geneMap.ext} &&
#end if
- salmon quant
+ salmon --no-version-check quant
--index '$index_path'
#if $quant_type.input.single_or_paired.single_or_paired_opts == 'single':
--libType ${quant_type.input.single_or_paired.libtype.strandedness}
@@ -425,28 +375,18 @@
#else
${quant_type.input.single_or_paired.libtype.orientation}${quant_type.input.single_or_paired.libtype.strandedness}
#end if
- #if $quant_type.input.single_or_paired.single_or_paired_opts == 'paired_interleaved':
- #if $compressed == 'BZ2':
- --mates1 <(bzcat < ./mate1.$ext | seqtk seq -1)
- --mates2 <(bzcat < ./mate1.$ext | seqtk seq -2)
- #else:
- --mates1 <(seqtk seq -1 ./mate1.$ext)
- --mates2 <(seqtk seq -2 ./mate1.$ext)
- #end if
+ #if $compressed == 'GZ':
+ --mates1 <(zcat < ./mate1.$ext)
+ --mates2 <(zcat < ./mate2.$ext)
+ #else if $compressed == 'BZ2':
+ --mates1 <(bzcat < ./mate1.$ext)
+ --mates2 <(bzcat < ./mate2.$ext)
#else:
- #if $compressed == 'GZ':
- --mates1 <(zcat < ./mate1.$ext)
- --mates2 <(zcat < ./mate2.$ext)
- #else if $compressed == 'BZ2':
- --mates1 <(bzcat < ./mate1.$ext)
- --mates2 <(bzcat < ./mate2.$ext)
- #else:
- --mates1 ./mate1.$ext
- --mates2 ./mate2.$ext
- #end if
+ --mates1 ./mate1.$ext
+ --mates2 ./mate2.$ext
#end if
#end if
- --threads "\${GALAXY_SLOTS:-4}"
+ --threads "\$SLOTS"
${quant_type.discardOrphansQuasi}
${quant_type.validmap.validateMappings}
#if $quant_type.validmap.validateMappings:
@@ -491,12 +431,12 @@
#if $geneMap:
ln -s "$geneMap" ./geneMap.${geneMap.ext} &&
#end if
- salmon quant
- -t '${quant_type.transcript}'
- -l '${quant_type.libtype.strandedness}'
- -a '${quant_type.afile}'
+ salmon --no-version-check quant
+ --targets '${quant_type.transcript}'
+ --libType '${quant_type.libtype.strandedness}'
+ --alignments '${quant_type.afile}'
$quant_type.ont
- --threads "\${GALAXY_SLOTS:-4}"
+ --threads "\$SLOTS"
${quant_type.discardOrphans}
${quant_type.noErrorModel}
#if $quant_type.numErrorBins:
@@ -584,33 +524,7 @@
-o ./output
]]>
-
-
macros.xml
+
+
1 ? \${GALAXY_SLOTS:-4} - 1 : 1 ));
+
#if $quant_type.qtype == "reads":
+ #set TRANSCRIPTSOURCE_CONDITIONAL = $quant_type.refTranscriptSource
@indexing@
@salreads@
#else:
@@ -60,9 +67,13 @@
-
-
-
+
+
+
+
+
+
+
@@ -100,9 +111,15 @@
@@ -136,10 +153,18 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+