Skip to content

Commit 32fe8c1

Browse files
Copilothechth
andcommitted
Update RIAssigner from 0.4.1 to 0.6.1 with new click CLI
Co-authored-by: hechth <12066490+hechth@users.noreply.github.com>
1 parent 3a6c00d commit 32fe8c1

File tree

3 files changed

+5
-26
lines changed

3 files changed

+5
-26
lines changed

tools/riassigner/macros.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<macros>
2-
<token name="@TOOL_VERSION@">0.4.1</token>
2+
<token name="@TOOL_VERSION@">0.6.1</token>
33
<xml name="creator">
44
<creator>
55
<person

tools/riassigner/riassigner.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<tool id="riassigner" name="RIAssigner" version="@TOOL_VERSION@+galaxy1" profile="21.09">
1+
<tool id="riassigner" name="RIAssigner" version="@TOOL_VERSION@+galaxy0" profile="21.09">
22
<description>compute retention indices</description>
33
<macros>
44
<import>macros.xml</import>
@@ -14,7 +14,7 @@
1414
</requirements>
1515

1616
<command detect_errors="exit_code"><![CDATA[
17-
python -m RIAssigner --reference "$reference_section.reference" "$reference_section.reference.ext" "$reference_section.reference_rt_units" --query "$query_section.query" "$query_section.query.ext" "$query_section.query_rt_units" --method "$method" --output "output.${output.ext}" &&
17+
riassigner compute --reference "$reference_section.reference" "$reference_section.reference.ext" "$reference_section.reference_rt_units" --query "$query_section.query" "$query_section.query.ext" "$query_section.query_rt_units" --method "$method" --output "output.${output.ext}" &&
1818
cp -r 'output.${output.ext}' '${output}'
1919
]]>
2020
</command>

tools/riassigner/riassigner_from_comment.xml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,11 @@
1414
</requirements>
1515

1616
<command detect_errors="exit_code"><![CDATA[
17-
python ${script} &&
18-
#if $input.ext == "csv"
19-
mv results.tsv ${output}
20-
#else:
21-
mv results.${input.ext} ${output}
22-
#end if
17+
riassigner ri-from-comment --query "$input" "$input.ext" "seconds" --ri-source "$format" --output "output.${output.ext}" &&
18+
cp -r 'output.${output.ext}' '${output}'
2319
]]>
2420
</command>
2521

26-
<configfiles>
27-
<configfile name="script">
28-
from RIAssigner.data import PandasData, MatchMSData
29-
#if $input.ext in ["csv", "tsv", "parquet"]
30-
query = PandasData('${input}', '${input.ext}', rt_unit="seconds")
31-
#else
32-
query = MatchMSData('${input}', '${input.ext}', rt_unit="seconds")
33-
#end if
34-
query.init_ri_from_comment('${format}')
35-
#if $input.ext == "csv"
36-
query.write('results.tsv')
37-
#else
38-
query.write('results.${input.ext}')
39-
#end if
40-
</configfile>
41-
</configfiles>
42-
4322
<inputs>
4423
<param name="input" type="data" format="csv,tsv,parquet,msp,mgf" label="Input File">
4524
<help>

0 commit comments

Comments
 (0)