# HG changeset patch # User gga # Date 1542989839 18000 # Node ID 72cabf21ce8d3643413323aea5e8c4b2d5d0511d # Parent 839c51972bb980d38dec081f9f9a21b78846b69b planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/chado commit f5c5d81fc9781371e12b91c0d609b9201587cda5 diff -r 839c51972bb9 -r 72cabf21ce8d analysis_add_analysis.xml --- a/analysis_add_analysis.xml Mon Nov 05 12:21:00 2018 -0500 +++ b/analysis_add_analysis.xml Fri Nov 23 11:17:19 2018 -0500 @@ -1,11 +1,11 @@ - - - macros.xml - - - + + macros.xml + + + $results ]]> - + - - - - + + + + - - - - - - ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ - + + + + + + ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ + - - - - - + + + + + Create an analysis @HELP@ - + diff -r 839c51972bb9 -r 72cabf21ce8d chado.py --- a/chado.py Mon Nov 05 12:21:00 2018 -0500 +++ b/chado.py Fri Nov 23 11:17:19 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 diff -r 839c51972bb9 -r 72cabf21ce8d macros.xml --- a/macros.xml Mon Nov 05 12:21:00 2018 -0500 +++ b/macros.xml Fri Nov 23 11:17:19 2018 -0500 @@ -2,7 +2,7 @@ - python-chado + python-chado jq @@ -16,7 +16,7 @@ - 2.2.2 + 2.2.3