# HG changeset patch
# User ebi-gxa
# Date 1606484260 0
# Node ID 844689a7f66e164fea7af31a3187113f2a08baa8
# Parent  f2e01e023137f23167fb1d53c0105956c6429f26
"planemo upload for repository https://github.com/ebi-gene-expression-group/container-galaxy-sc-tertiary/ commit a1ad1ddd9b8e4db5bb82c3accae8311e0e488b19"

diff -r f2e01e023137 -r 844689a7f66e ct_combine_tool_outputs.xml
--- a/ct_combine_tool_outputs.xml	Thu Jul 23 11:59:15 2020 -0400
+++ b/ct_combine_tool_outputs.xml	Fri Nov 27 13:37:40 2020 +0000
@@ -1,5 +1,5 @@
-<tool id="ct_combine_tool_outputs" name="Cell types - combine tools outputs" version="@TOOL_VERSION@+galaxy2" profile="@PROFILE@">
-    <description>Combine predictions for single tool from multiple datasets</description>
+<tool id="ct_combine_tool_outputs" name="Cell types - combine tools outputs" version="@TOOL_VERSION@+galaxy0" profile="@PROFILE@">
+    <description>for single tool from multiple datasets</description>
     <macros>
         <import>ct_macros.xml</import>
     </macros>
@@ -27,7 +27,7 @@
     </outputs>
     <tests>
         <test>
-            <param name="input_tables" value="prod_outputs_scpred/E-MTAB-6386_scpred_final-labs.tsv,prod_outputs_scpred/OTHER-DATASET_scpred_final-labs.tsv" />
+            <param name="input_tables" value="prod_outputs_scpred/E-ENAD-27_scpred.txt,prod_outputs_scpred/E-GEOD-81608_scpred.txt" />
             <param name="scores" value="TRUE" />
             <param name="exclusions" value="exclusions.yml" />
             <output name="output_table" file="combined_results.tsv" compare="sim_size" />
diff -r f2e01e023137 -r 844689a7f66e ct_macros.xml
--- a/ct_macros.xml	Thu Jul 23 11:59:15 2020 -0400
+++ b/ct_macros.xml	Fri Nov 27 13:37:40 2020 +0000
@@ -1,10 +1,10 @@
 <macros>
-    <token name="@TOOL_VERSION@">1.1.0</token>
+    <token name="@TOOL_VERSION@">1.1.1</token>
     <token name="@HELP@">More information can be found at https://github.com/ebi-gene-expression-group/cell-types-analysis</token>
     <token name="@PROFILE@">18.01</token>
     <xml name="requirements">
       <requirements>
-        <requirement type="package" version="0.1.1">cell-types-analysis</requirement>
+        <requirement type="package" version="0.1.9">cell-types-analysis</requirement>
             <yield/>
       </requirements>
     </xml>
@@ -15,6 +15,7 @@
     </xml>
     <token name="@VERSION_HISTORY@"><![CDATA[
 **Version history**
+0.1.6+galaxy0: Add removing non-alphanumeric characters from labels in metadata files
 0.0.5+galaxy0: Initial contribution. Andrey Solovyev, Expression Atlas team https://www.ebi.ac.uk/gxa/home at EMBL-EBI https://www.ebi.ac.uk/.
 0.0.5+galaxy1: Standardise input/output format into .txt. 
     ]]></token>
@@ -34,6 +35,17 @@
             <option value="resnik">resnik</option>
         </param>
     </xml>
+    <xml name="sanitize_strings">
+        <sanitizer invalid_char="">
+        <valid initial="string.ascii_letters,string.digits">
+            <add value="_" />
+            <add value="-" />
+            <add value="[" />
+            <add value="]" />
+            <add value=" " />
+            </valid>
+    </sanitizer>
+    </xml>
     <xml name="citations">
       <citations>
         <citation type="bibtex">