Mercurial > repos > galaxyp > peptideshaker

changeset 53:d67a3c1bfd09 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/peptideshaker commit 1327a0e10d66e5ed6a8b63b211672a724fcac424
author galaxyp
date Wed, 08 May 2019 14:06:07 -0400
parents 864bd76db767
children 7fdd9119cc4f
files peptide_shaker.xml
diffstat 1 files changed, 25 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/peptide_shaker.xml	Wed Jan 16 08:18:39 2019 -0500
+++ b/peptide_shaker.xml	Wed May 08 14:06:07 2019 -0400
@@ -1,4 +1,4 @@
-<tool id="peptide_shaker" name="Peptide Shaker" version="@PEPTIDESHAKER_VERSION@.2">
+<tool id="peptide_shaker" name="Peptide Shaker" version="@PEPTIDESHAKER_VERSION@.3">
     <description>
         Perform protein identification using various search engines based on results from SearchGUI
     </description>
@@ -130,6 +130,11 @@
 
         2>> $temp_stderr)
 
+        ## If the user chose to zip the results but also export reports out of the zip, we have to unzip them
+        #if $exporting_options.zip_conditional.zip_output_boolean == 'zip' and $exporting_options.zip_conditional.export_reports_when_zip:
+            && unzip \$cwd/peptideshaker_output.zip 'reports/*' -d \$cwd/output_reports
+        #end if
+
 	      #if len(output_reports_list)>0:
             #if '0' in $output_reports_list:
                 && find \$cwd/output_reports -name '*Certificate_of_Analysis.txt' -exec bash -c 'mv "$0" "certificate.txt"' {} \;
@@ -287,7 +292,9 @@
                 <when value="separate">
                     <param name="export_cps" type="boolean" truevalue="1" falsevalue="0" checked="false" label="Exports the CPS file" />
                 </when>
-                <when value="zip" />
+                <when value="zip">
+                    <param name="export_reports_when_zip" type="boolean" truevalue="1" falsevalue="0" checked="false" label="Also export reports out of the zip" />
+                </when>
             </conditional>
 
             <param name="output_reports" type="select" display="checkboxes" multiple="True" optional="true" label="Reports to be generated">
@@ -310,7 +317,7 @@
     </inputs>
     <outputs>
         <data format="mzid" name="mzidentML" from_work_dir="output.mzid" label="${tool.name} on ${on_string}: mzidentML file">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and mzidentml_conditional['mzidentml_creation'] is True</filter>
+            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and exporting_options['mzidentml_conditional']['mzidentml_creation'] is True</filter>
         </data>
         <data format="peptideshaker_archive" name="output_cps" from_work_dir="peptideshaker_output.cpsx" label="${tool.name} on ${on_string}: CPS file">
             <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and exporting_options['zip_conditional']['export_cps'] is True</filter>
@@ -324,44 +331,44 @@
         </data>
         -->
 	      <data format="txt" name="output_certificate" from_work_dir="certificate.txt" label="${tool.name} on ${on_string}: Parameters">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '0' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '0' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_hierarchical" from_work_dir="hierarchical.txt" label="${tool.name} on ${on_string}: Hierarchical Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '1' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '1' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_psm_phosphorylation" from_work_dir="psm_phospho.txt" label="${tool.name} on ${on_string}: PSM Phosphorylation Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '2' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '2' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_psm" from_work_dir="psm.txt" label="${tool.name} on ${on_string}: PSM Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '3' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '3' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_psm_nonvalidated" from_work_dir="psm_nonvalidated.txt" label="${tool.name} on ${on_string}: PSM Report with non-validated matches">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '4' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '4' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_extended_psm" from_work_dir="psmx.txt" label="${tool.name} on ${on_string}: Extended PSM Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '11' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '11' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_peptides_phosphorylation" from_work_dir="peptides_phospho.txt" label="${tool.name} on ${on_string}: Peptide Phosphorylation Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '5' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '5' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_peptides" from_work_dir="peptides.txt" label="${tool.name} on ${on_string}: Peptide Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '6' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '6' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_peptides_nonvalidated" from_work_dir="peptides_nonvalidated.txt" label="${tool.name} on ${on_string}: Peptide Report with non-validated matches">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '7' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '7' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_proteins_phosphorylation" from_work_dir="proteins_phospho.txt" label="${tool.name} on ${on_string}: Protein Phosphorylation Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '8' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '8' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_proteins" from_work_dir="proteins.txt" label="${tool.name} on ${on_string}: Protein Report">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '9' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '9' in exporting_options['output_reports']</filter>
         </data>
         <data format="tabular" name="output_proteins_nonvalidated" from_work_dir="proteins_nonvalidated.txt" label="${tool.name} on ${on_string}: Protein Repor with non-validated matches">
-            <filter>exporting_options['zip_conditional']['zip_output_boolean'] is False and str(exporting_options['output_reports']) != 'None' and '10' in exporting_options['output_reports']</filter>
+            <filter>(exporting_options['zip_conditional']['zip_output_boolean'] is False or (exporting_options['zip_conditional']['zip_output_boolean'] is True and exporting_options['zip_conditional']['export_reports_when_zip'] is True) ) and str(exporting_options['output_reports']) != 'None' and '10' in exporting_options['output_reports']</filter>
         </data>
     </outputs>
     <tests>
-        <test>
+        <test expect_num_outputs="1">
             <param name="searchgui_input" value="tiny_searchgui_modifications_result1.zip" ftype="searchgui_archive"/>
             <param name="processing_options_selector" value="no"/>
             <param name="filtering_options_selector" value="no"/>
@@ -370,7 +377,7 @@
             <param name="export_cps" value="1"/>
             <output name="output_zip" file="peptide_shaker_modifications_result1.zip" ftype="zip" compare="sim_size" delta="3000" />
         </test>
-        <test>
+        <test expect_num_outputs="12">
             <param name="searchgui_input" value="tiny_searchgui_modifications_result1.zip" ftype="searchgui_archive"/>
             <param name="processing_options_selector" value="no"/>
             <param name="filtering_options_selector" value="yes"/>
@@ -391,7 +398,7 @@
             <output name="output_proteins_phosphorylation" file="peptide_shaker_modifications_result1.output_proteins_phosphorylation" ftype="tabular"/>
             <output name="output_proteins_nonvalidated" file="peptide_shaker_modifications_result1.output_proteins_nonvalidated" ftype="tabular"/>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="searchgui_input" value="tiny_searchgui_modifications_result1.zip" ftype="searchgui_archive"/>
             <param name="processing_options_selector" value="no"/>
             <param name="filtering_options_selector" value="no"/>