Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SortMeRNA: update version 4.3.6 #1316

Merged
merged 42 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c65dc08
Update_files
gallardoalba Jun 23, 2023
6e8bda6
Merge branch 'master' of https://github.com/bgruening/galaxytools
gallardoalba Jun 27, 2023
6313124
First commit
gallardoalba Jun 27, 2023
603743a
Remove file
gallardoalba Jun 27, 2023
9601808
Update files
gallardoalba Aug 24, 2023
27d51fb
Update PR
gallardoalba Aug 29, 2023
dcc2a4f
Update wrapper
gallardoalba Aug 30, 2023
7c40e16
Remove empty files
gallardoalba Aug 30, 2023
31a15b9
Change extension
gallardoalba Aug 30, 2023
47d13c8
Remove unnecesary file
gallardoalba Aug 30, 2023
8ec6e35
Update tests
gallardoalba Aug 31, 2023
e029e31
Update wrapper
gallardoalba Aug 31, 2023
4207dd3
Remove comments
gallardoalba Aug 31, 2023
c766d44
Update wrapper
gallardoalba Aug 31, 2023
4f0e976
Include KVDB path
gallardoalba Aug 31, 2023
eb99f5d
use a profile version
bgruening Aug 31, 2023
fc74906
Update wrapper
gallardoalba Aug 31, 2023
e2afe7d
Merge branch 'Update_sortMeRNA' of github.com:gallardoalba/galaxytool…
gallardoalba Aug 31, 2023
2696517
Update files
gallardoalba Aug 31, 2023
eff3dfa
Fix test
gallardoalba Aug 31, 2023
dbae243
Update wrapper
gallardoalba Aug 31, 2023
a7c1565
Remove line
gallardoalba Aug 31, 2023
d31245c
Fix type
gallardoalba Aug 31, 2023
137525e
Add file
gallardoalba Aug 31, 2023
d3f2c82
Remove compare BAM files
gallardoalba Sep 1, 2023
8c299b5
Remove conditional
gallardoalba Sep 1, 2023
91df30f
Modify tests
gallardoalba Sep 1, 2023
6834ee7
Remove extra output
gallardoalba Sep 1, 2023
634461f
Add file
gallardoalba Sep 1, 2023
fcf9c98
Update test
gallardoalba Sep 1, 2023
673f07d
Add changes
gallardoalba Sep 1, 2023
d1a2afb
Fix error
gallardoalba Sep 1, 2023
2ea8802
Add ftype
gallardoalba Sep 1, 2023
7a2786f
Increse line_diff
gallardoalba Sep 1, 2023
996203a
Add_database
gallardoalba Sep 21, 2023
9036288
sortmerna: add test for data manager
bernt-matthias Oct 18, 2023
0f86f66
remove yield
bernt-matthias Oct 18, 2023
c7a0985
fix python linting
bernt-matthias Oct 18, 2023
1de1e69
add profile to data manager
bernt-matthias Oct 18, 2023
847afec
more linter fixes
bernt-matthias Oct 18, 2023
aa8100f
fix bam output
bernt-matthias Oct 18, 2023
d622e47
simplify BAM sorting
bernt-matthias Oct 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions tools/rna_tools/sortmerna/macros.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<macros>
<token name="@TOOL_VERSION@">4.3.6</token>
<token name="@VERSION_SUFFIX@">0</token>
<xml name="requirements">
<requirements>
<requirement type="package" version="@TOOL_VERSION@">sortmerna</requirement>
<requirement type="package" version="1.17">samtools</requirement>
</requirements>
</xml>
<xml name="db_prep">
<param name="seed_length" type="integer" min="0" max="100" value="18" label="Seed length for database indexing" help="(-L)"/>
gallardoalba marked this conversation as resolved.
Show resolved Hide resolved
<param name="max_pos" type="integer" min="0" max="100000" value="10000" label="Maximum number of positions to store for each k-mer for database indexing" help="With 0, all positions are stored (--max_pos)"/>
</xml>
<xml name="reads_macro">
<param argument="--reads" type="data" format="fasta,fastq,fastq.gz" label="Querying sequences"/>
gallardoalba marked this conversation as resolved.
Show resolved Hide resolved
</xml>
<xml name="paired_type_macro">
<param name="paired_type" type="select" display="radio" label="If one of the paired-end reads aligns and the other one does not">
<option value="">Leave the reads split between aligned and rejected files</option>
<option value="--paired_in">Output both reads to aligned file (--paired_in)</option>
<option value="--paired_out">Output both reads to rejected file (--paired_out)</option>
<option value="--sout">Separate paired and singleton aligned reads (--sout)</option>
</param>
</xml>
<xml name="output_alignments">
<param name="print_all_reads" type="boolean" checked="false" truevalue="--print_all_reads" falsevalue="" label="Output null alignment strings for non-aligned reads"/>
<conditional name="blast">
<param name="blast_output" type="select" label="Output BLAST report?">
<option value="True">Yes</option>
<option value="False" selected="True">No</option>
</param>
<when value="True">
<param name="blast_format" type="select" label="BLAST-like format?">
<option value="0">pairwise (--blast '0')</option>
<option value="1">tabular BLAST -m 8 format (--blast '1')</option>
<option value="1 cigar">tabular + column for CIGAR (--blast '1 cigar')</option>
<option value="1 cigar qcov">tabular + columns for CIGAR and query coverage (--blast '1 cigar qcov')</option>
<option value="1 cigar qcov qstrand">tabular + columns for CIGAR, query coverage and strand (--blast '1 cigar qcov qstrand')</option>
</param>
</when>
<when value="False"/>
</conditional>
</xml>
<xml name="otu_picking">
<conditional name="otu">
<param name="otu_map" type="select" label="Pick OTUs?">
<option value="True">Yes</option>
<option value="False" selected="true">No</option>
</param>
<when value="True">
<param argument="--id" type="float" value="0.97" label="Percentage id similarity threshold" help="The alignment must still pass the E-value threshold" />
<param argument="--coverage" type="float" value="0.97" label="Percentage query coverage threshold" help="The alignment must still pass the E-value threshold" />
<param name="de_novo_otu" type="boolean" truevalue="--de_novo_otu" falsevalue="" label="FASTA/FASTQ file for reads matching database below percentage id" help="--de_novo_otu" />
</when>
<when value="False"/>
</conditional>
</xml>
<token name="@OTU_PICKING@">
#if $report.otu.otu_map == 'True'
--otu_map
--id '$report.otu.id'
--coverage '$report.otu.coverage'
$report.otu.de_novo_otu
#end if
</token>
<token name="@ALIGNMENTS@">
$report.print_all_reads
--sam
--SQ
#if $report.blast.blast_output == 'True'
--blast '$report.blast.blast_format'
#end if
</token>
<token name="@PREPROCESSING@">
#set $ref = list()
#if str( $databases_type.databases_selector ) == 'history'
#for $db in $databases_type.database_name
$ref.append('%s' % $db )
#end for
#else if str( $databases_type.databases_selector ) == 'cached_to_index'
#for $db in $databases_type.input_databases.fields.path.split(",")
$ref.append('%s' % $db )
#end for
#else
#for $db in $databases_type.input_databases.fields.path.split(",")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the idea is here that a single entry is selected and split by comma? How does this look like in practice?

Wondering if making the cached case multiple="true" would be an option? Might be more flexible (backward compatibility might be a bit tricky .. but not very)?

$ref.append('%s' % $db )
#end for
#end if
</token>
<xml name="citations">
<citations>
<citation type="doi">10.1093/bioinformatics/bts611</citation>
<citation type="doi">10.1093/nar/gks1219</citation>
<citation type="doi">10.1093/nar/gks1005</citation>
<citation type="doi">10.1093/bioinformatics/btq461</citation>
<citation type="doi">10.1038/nbt.2198</citation>
</citations>
</xml>
</macros>
Loading
Loading