Mercurial > repos > bimib > marea

changeset 2:3b3d0e5d0802 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bimib
date Wed, 07 Nov 2018 07:16:37 -0500
parents 9e63d5f02d62
children 02577e65dcca
files Marea/marea.xml Marea/marea_cluster.xml Marea/marea_macros.xml
diffstat 3 files changed, 10 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Marea/marea.xml	Wed Nov 07 07:07:46 2018 -0500
+++ b/Marea/marea.xml	Wed Nov 07 07:16:37 2018 -0500
@@ -3,8 +3,11 @@
     <macros>
         <import>marea_macros.xml</import>
     </macros>
-    <expand macro="requirements" />
     <requirements>
+        <requirement type="package">pandas</requirement>
+        <requirement type="package">scipy</requirement>
+        <requirement type="package">cobrapy</requirement>
+        <requirement type="package">python-libsbml</requirement>
         <requirement type="package">lxml</requirement>
         <requirement type="package">svglib</requirement>
         <requirement type="package">reportlab</requirement>
@@ -44,7 +47,7 @@
 
     <inputs>
         <conditional name="cond_rule">
-            <expand macro="options" />
+            <expand macro="options"/>
             <when value="HMRcore">
             </when>
             <when value="Recon">
--- a/Marea/marea_cluster.xml	Wed Nov 07 07:07:46 2018 -0500
+++ b/Marea/marea_cluster.xml	Wed Nov 07 07:16:37 2018 -0500
@@ -3,8 +3,11 @@
     <macros>
         <import>marea_macros.xml</import>
     </macros>
-    <expand macro="requirements" />
     <requirements>
+        <requirement type="package">pandas</requirement>
+        <requirement type="package">scipy</requirement>
+        <requirement type="package">cobrapy</requirement>
+        <requirement type="package">python-libsbml</requirement>
         <requirement type="package">scikit-learn</requirement>
         <requirement type="package">matplotlib</requirement>
     </requirements>
@@ -32,7 +35,7 @@
     </command>
     <inputs>
         <conditional name="cond_rule">
-            <expand macro="options" />
+            <expand macro="options"/>
             <when value="Custom">
                 <param name="Custom_rules" type="data" format="tabular, csv, tsv, xml" label="Custom rules" />
             </when>
--- a/Marea/marea_macros.xml	Wed Nov 07 07:07:46 2018 -0500
+++ b/Marea/marea_macros.xml	Wed Nov 07 07:16:37 2018 -0500
@@ -1,14 +1,5 @@
 <macros>
 
-    <xml name="requirements">
-        <requirements>
-            <requirement type="package">pandas</requirement>
-            <requirement type="package">scipy</requirement>
-            <requirement type="package">cobrapy</requirement>
-            <requirement type="package">python-libsbml</requirement>
-        </requirements>
-    </xml>
-
     <xml name="options">
         <param name="rules_selector" argument="--rules_selector" type="select" label="Gene-Protein-Reaction rules:">
             <option value="HMRcore" selected="true">HMRcore rules</option>