| Previous changeset 6:ba6bee1b2d3c (2018-11-05) Next changeset 8:75ab486ec8e0 (2019-01-24) |
|
Commit message:
planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/chado commit f5c5d81fc9781371e12b91c0d609b9201587cda5 |
|
modified:
analysis_delete_analyses.xml chado.py macros.xml |
| b |
| diff -r ba6bee1b2d3c -r 702c04ac6921 analysis_delete_analyses.xml --- a/analysis_delete_analyses.xml Mon Nov 05 12:21:30 2018 -0500 +++ b/analysis_delete_analyses.xml Fri Nov 23 11:17:47 2018 -0500 |
| [ |
| @@ -1,12 +1,12 @@ <?xml version="1.0"?> <tool id="analysis_delete_analyses" name="Chado analysis delete" 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 analysis delete_analyses @@ -15,22 +15,22 @@ > $results ]]></command> - <inputs> + <inputs> <!-- arguments --> <!-- options --> - <param argument="--analysis_id" - type="select" - dynamic_options="list_analyses()" - label="Analysis" /> + <param argument="--analysis_id" + type="select" + dynamic_options="list_analyses()" + label="Analysis" /> - </inputs> - <outputs> - <data format="txt" name="results"/> - </outputs> - <help> + </inputs> + <outputs> + <data format="txt" name="results"/> + </outputs> + <help> Delete analysis @HELP@ - </help> + </help> </tool> |
| b |
| diff -r ba6bee1b2d3c -r 702c04ac6921 chado.py --- a/chado.py Mon Nov 05 12:21:30 2018 -0500 +++ b/chado.py Fri Nov 23 11:17:47 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 ba6bee1b2d3c -r 702c04ac6921 macros.xml --- a/macros.xml Mon Nov 05 12:21:30 2018 -0500 +++ b/macros.xml Fri Nov 23 11:17:47 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> |