# HG changeset patch # User iuc # Date 1444663182 14400 # Node ID 37f53bf6c2b104fb945b51221ed8b8096fc71c7f # Parent d188dfa05d71f7578b1a1762acfe7d835e085010 planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/macs2 commit 63955994af5090ec444c03c221df0012d5ae4e74 diff -r d188dfa05d71 -r 37f53bf6c2b1 macs2_callpeak.xml --- a/macs2_callpeak.xml Mon Jun 01 23:00:45 2015 -0400 +++ b/macs2_callpeak.xml Mon Oct 12 11:19:42 2015 -0400 @@ -85,7 +85,7 @@ #end if ## run R to create pdf from model script - #if 'pdf' in str($outputs).split(','): + #if $nomodel_type.nomodel_type_selector == 'create_model' and 'pdf' in str($outputs).split(','): && Rscript MACS2_model.r > MACS2_model.r.log #end if @@ -151,7 +151,7 @@ - + @@ -235,7 +235,12 @@ 'summits' in outputs - 'pdf' in outputs + + (( + 'pdf' in outputs and + nomodel_type['nomodel_type_selector'] == "create_model" + )) + 'bdg' in outputs @@ -262,6 +267,17 @@ + + + + + + + + + + + **What it does** diff -r d188dfa05d71 -r 37f53bf6c2b1 macs2_macros.xml --- a/macs2_macros.xml Mon Jun 01 23:00:45 2015 -0400 +++ b/macs2_macros.xml Mon Oct 12 11:19:42 2015 -0400 @@ -27,7 +27,7 @@ - + diff -r d188dfa05d71 -r 37f53bf6c2b1 test-data/magic.pdf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/magic.pdf Mon Oct 12 11:19:42 2015 -0400 @@ -0,0 +1,1 @@ +%PDF-1.4 diff -r d188dfa05d71 -r 37f53bf6c2b1 tool_dependencies.xml --- a/tool_dependencies.xml Mon Jun 01 23:00:45 2015 -0400 +++ b/tool_dependencies.xml Mon Oct 12 11:19:42 2015 -0400 @@ -1,10 +1,10 @@ - + - + @@ -13,7 +13,7 @@ - + $REPOSITORY_INSTALL_DIR