Skip to content

Commit e96b5db

Browse files
committed
Add new parameters
1 parent 836d0f7 commit e96b5db

2 files changed

Lines changed: 24 additions & 4 deletions

File tree

galaxy/lukasa.xml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<tool id="lukasa" name="Lukasa" version="@TOOL_VERSION@+galaxy0">
22
<description>Align protein evidence against genomic contigs using metaeuk and spaln</description>
33
<macros>
4-
<token name="@TOOL_VERSION@">0.13.0</token>
5-
<!-- note that this DOI is for lukasa 0.0.6 - update as needed -->
6-
<token name="@DOI@">10.5281/zenodo.7236571</token>
4+
<token name="@TOOL_VERSION@">0.14.1</token>
5+
<!-- note that this DOI is for lukasa 0.14.0 - update as needed -->
6+
<token name="@DOI@">10.5281/zenodo.7339605</token>
77
</macros>
88
<requirements>
99
<requirement type="package" version="@TOOL_VERSION@">lukasa</requirement>
@@ -18,6 +18,12 @@
1818
#end if
1919
#if str($min_intron).strip():
2020
--min_intron $min_intron
21+
#end if
22+
#if str($min_coverage).strip()
23+
--min_coverage $min_coverage
24+
#end if
25+
#if str($eval).strip()
26+
--eval $eval
2127
#end if
2228
--output_filename '$output_gff' '$contigs_fasta' '$proteins_fasta'
2329
]]></command>
@@ -27,8 +33,10 @@
2733
<param name="species_table" type="text" label="Spaln species table to use (optional)"/>
2834
<param argument="--max_intron" type="integer" min="0" label="Max intron length" help="Maximum intron length (passed to metaeuk)" optional="true" />
2935
<param argument="--min_intron" type="integer" min="0" label="Min intron length" help="Minimum intron length (passed to metaeuk and spaln)" optional="true" />
36+
<param argument="--min_coverage" type="float" min="0" max="1" label="Min coverage" help="Minimum proportion of a gene that needs to be covered by exons" optional="true" />
37+
<param argument="--eval" type="float" min="0" label="E-val" help="Maximum E-val for MetaEuk" optional="true" />
3038
</inputs>
31-
<outputs>
39+
<outputs>
3240
<data name="output_gff" format="gff3" label="Map proteins to genome ${on_string}"/>
3341
</outputs>
3442
<tests>

lukasa.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ def build_template(
1616
species_table: str = "",
1717
max_intron: str = "",
1818
min_intron: str = "",
19+
min_coverage: str = "",
20+
eval: str = ""
1921
):
2022
template = f"""
2123
contigs_fasta:
@@ -28,6 +30,8 @@ def build_template(
2830
path: {protein_path}
2931
{max_intron}
3032
{min_intron}
33+
{min_coverage}
34+
{eval}
3135
{species_table}
3236
3337
$namespaces:
@@ -59,6 +63,8 @@ def is_fasta(input_filename):
5963
parser.add_argument("--workflow_dir", default=cwl_workflow_dir)
6064
parser.add_argument("--max_intron", type=int, help="Maximum intron length")
6165
parser.add_argument("--min_intron", type=int, help="Minimum intron length")
66+
parser.add_argument("--min_coverage", type=float, help="Minimum proportion of a gene that is exons")
67+
parser.add_argument("--eval", type=float, help="Maximum E-value for MetaEuk")
6268
parser.add_argument("--debug", action="store_true", default=False)
6369
parser.add_argument("contigs_filename", help="File with genomic contigs")
6470
parser.add_argument("proteins_filename", help="File with proteins to map")
@@ -76,13 +82,19 @@ def is_fasta(input_filename):
7682
max_intron = f"max_intron: {args.max_intron}\n"
7783
if args.min_intron is not None:
7884
min_intron = f"min_intron: {args.min_intron}\n"
85+
if args.min_coverage is not None:
86+
min_coverage = f'min_coverage: "{args.min_coverage}"\n'
87+
if args.eval is not None:
88+
eval = f'eval: "{args.eval}"\n'
7989
cwl_input_file.write(
8090
build_template(
8191
abspath(args.contigs_filename),
8292
abspath(args.proteins_filename),
8393
species_table=species_table,
8494
max_intron=max_intron,
8595
min_intron=min_intron,
96+
min_coverage=min_coverage,
97+
eval=eval
8698
)
8799
)
88100
cwl_input_file.close()

0 commit comments

Comments
 (0)