| Previous changeset 1:0214383c6578 (2018-11-05) Next changeset 3:ec5e852913ee (2019-01-24) |
|
Commit message:
planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/chado commit f5c5d81fc9781371e12b91c0d609b9201587cda5 |
|
modified:
chado.py expression_add_expression.xml macros.xml |
| b |
| diff -r 0214383c6578 -r 4f42edf27351 chado.py --- a/chado.py Mon Nov 05 12:16:52 2018 -0500 +++ b/chado.py Fri Nov 23 11:09:56 2018 -0500 |
| [ |
| @@ -406,6 +406,7 @@ # there. data = _list_organisms(ci, *args, **kwargs) cache[cacheKey] = data + ci.session.close() return data try: # The cache key may or may not be in the cache at this point, it @@ -413,12 +414,14 @@ # when we checked above and now, so we reference the object from the # cache in preparation to return. data = cache[cacheKey] + ci.session.close() return data except KeyError: # If access fails due to eviction, we will fail over and can ensure that # data is inserted. data = _list_organisms(ci, *args, **kwargs) cache[cacheKey] = data + ci.session.close() return data @@ -447,6 +450,7 @@ data = _list_analyses(ci, *args, **kwargs) cache[cacheKey] = data + ci.session.close() return data try: # The cache key may or may not be in the cache at this point, it @@ -454,12 +458,14 @@ # when we checked above and now, so we reference the object from the # cache in preparation to return. data = cache[cacheKey] + ci.session.close() return data except KeyError: # If access fails due to eviction, we will fail over and can ensure that # data is inserted. data = _list_analyses(ci, *args, **kwargs) cache[cacheKey] = data + ci.session.close() return data |
| b |
| diff -r 0214383c6578 -r 4f42edf27351 expression_add_expression.xml --- a/expression_add_expression.xml Mon Nov 05 12:16:52 2018 -0500 +++ b/expression_add_expression.xml Fri Nov 23 11:09:56 2018 -0500 |
| [ |
| @@ -1,12 +1,12 @@ <?xml version="1.0"?> <tool id="expression_add_expression" name="Chado expression add" version="@WRAPPER_VERSION@.0"> - <description></description> - <macros> - <import>macros.xml</import> - </macros> - <expand macro="requirements"/> + <description></description> + <macros> + <import>macros.xml</import> + </macros> + <expand macro="requirements"/> <code file="chado.py"/> - <command detect_errors="aggressive"><![CDATA[ + <command detect_errors="aggressive"><![CDATA[ @AUTH@ chakin expression add_expression @@ -16,20 +16,20 @@ > $results ]]></command> - <inputs> - <!-- arguments --> - <param argument="organism_id" type="select" dynamic_options="list_organisms()" label="Organism" /> - <param argument="analysis_id" type="select" dynamic_options="list_analyses()" label="Analysis" /> - <param name="file_path" label="Expression matrix" argument="file_path" type="data" format="tabular" help="Tabular file where columns are experimental conditions, and rows are features" /> + <inputs> + <!-- arguments --> + <param argument="organism_id" type="select" dynamic_options="list_organisms()" label="Organism" /> + <param argument="analysis_id" type="select" dynamic_options="list_analyses()" label="Analysis" /> + <param name="file_path" label="Expression matrix" argument="file_path" type="data" format="tabular" help="Tabular file where columns are experimental conditions, and rows are features" /> - <expand macro="wait_for"/> - </inputs> - <outputs> - <data format="txt" name="results"/> - </outputs> - <help> + <expand macro="wait_for"/> + </inputs> + <outputs> + <data format="txt" name="results"/> + </outputs> + <help> Add an expression matrix file to the database @HELP@ - </help> + </help> </tool> |
| b |
| diff -r 0214383c6578 -r 4f42edf27351 macros.xml --- a/macros.xml Mon Nov 05 12:16:52 2018 -0500 +++ b/macros.xml Fri Nov 23 11:09:56 2018 -0500 |
| b |
| @@ -2,7 +2,7 @@ <macros> <xml name="requirements"> <requirements> - <requirement type="package" version="2.2.2">python-chado</requirement> + <requirement type="package" version="2.2.3">python-chado</requirement> <requirement type="package" version="1.5">jq</requirement> <yield/> </requirements> @@ -16,7 +16,7 @@ </stdio> </xml> - <token name="@WRAPPER_VERSION@">2.2.2</token> + <token name="@WRAPPER_VERSION@">2.2.3</token> <xml name="citation"> <citations> |