| Previous changeset 1:9e63d5f02d62 (2018-11-07) Next changeset 3:02577e65dcca (2018-11-13) |
|
Commit message:
Uploaded |
|
modified:
Marea/marea.xml Marea/marea_cluster.xml Marea/marea_macros.xml |
| b |
| diff -r 9e63d5f02d62 -r 3b3d0e5d0802 Marea/marea.xml --- a/Marea/marea.xml Wed Nov 07 07:07:46 2018 -0500 +++ b/Marea/marea.xml Wed Nov 07 07:16:37 2018 -0500 |
| b |
| @@ -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"> |
| b |
| diff -r 9e63d5f02d62 -r 3b3d0e5d0802 Marea/marea_cluster.xml --- 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 |
| b |
| @@ -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> |
| b |
| diff -r 9e63d5f02d62 -r 3b3d0e5d0802 Marea/marea_macros.xml --- 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 |
| b |
| @@ -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> |