Merge pull request #605 from RECETOX/hechth/issue604

rcx-aplcms version 0.13.4
RECETOX · Oct 31, 2024 · 5da5b5e · 5da5b5e
2 parents 8c76667 + c52dfae
commit 5da5b5e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 4 deletions.
diff --git a/tools/recetox_aplcms/macros.xml b/tools/recetox_aplcms/macros.xml
@@ -1,5 +1,5 @@
 <macros>
-    <token name="@TOOL_VERSION@">0.13.3</token>
+    <token name="@TOOL_VERSION@">0.13.4</token>
     <xml name="requirements">
         <requirements>
             <requirement type="package" version="@TOOL_VERSION@">r-recetox-aplcms</requirement>

diff --git a/tools/recetox_aplcms/recetox_aplcms_correct_time.xml b/tools/recetox_aplcms/recetox_aplcms_correct_time.xml
@@ -1,4 +1,4 @@
-<tool id="recetox_aplcms_correct_time" name="recetox-aplcms - correct time" version="@TOOL_VERSION@+galaxy2" profile="21.09">
+<tool id="recetox_aplcms_correct_time" name="recetox-aplcms - correct time" version="@TOOL_VERSION@+galaxy0" profile="21.09">
     <description>correct retention time across samples for peak alignment</description>
     <macros>
         <import>macros.xml</import>

diff --git a/tools/recetox_aplcms/recetox_aplcms_generate_feature_table.xml b/tools/recetox_aplcms/recetox_aplcms_generate_feature_table.xml
@@ -73,7 +73,6 @@
     </outputs>
 
     <tests>
-        <test expect_failure="true" />
         <test>
             <param name="profile" value="remove_noise_docker.parquet" />
             <output name="output_file" file="peak_table_galaxy.parquet" />

diff --git a/tools/recetox_aplcms/recetox_aplcms_remove_noise.xml b/tools/recetox_aplcms/recetox_aplcms_remove_noise.xml
@@ -30,7 +30,7 @@
                 intensity_weighted = $intensity_weighted,
                 do.plot = FALSE,
                 cache = FALSE,
-                grouping_threshold = as.numeric('$grouping_threshold')
+                grouping_threshold = $grouping_threshold
             )
 
             profile <- save_sample_name(profile, sample_name)

diff --git a/tools/recetox_aplcms/test-data/peak_table_galaxy.parquet b/tools/recetox_aplcms/test-data/peak_table_galaxy.parquet
diff --git a/tools/recetox_aplcms/test-data/remove_noise_docker.parquet b/tools/recetox_aplcms/test-data/remove_noise_docker.parquet
diff --git a/tools/recetox_aplcms/test-data/remove_noise_docker_threshold.parquet b/tools/recetox_aplcms/test-data/remove_noise_docker_threshold.parquet