Mercurial > repos > gga > chado_phylogeny_load_tree

changeset 8:2b4c9d801a1e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/chado commit f5c5d81fc9781371e12b91c0d609b9201587cda5
author gga
date Fri, 23 Nov 2018 10:59:04 -0500
parents 112be1519592
children d344316d56b5
files chado.py macros.xml phylogeny_load_tree.xml
diffstat 3 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/chado.py	Mon Nov 05 12:10:32 2018 -0500
+++ b/chado.py	Fri Nov 23 10:59:04 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
 
 
--- a/macros.xml	Mon Nov 05 12:10:32 2018 -0500
+++ b/macros.xml	Fri Nov 23 10:59:04 2018 -0500
@@ -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>
--- a/phylogeny_load_tree.xml	Mon Nov 05 12:10:32 2018 -0500
+++ b/phylogeny_load_tree.xml	Fri Nov 23 10:59:04 2018 -0500
@@ -34,17 +34,17 @@
 	<inputs>
 	    <!-- arguments -->
 		<param name="newick" label="Newick" argument="newick" type="data" format="txt" help="Newick file to load (or directory containing multiple newick files to load)" />
-		<param argument="--analysis_id"
+		<param argument="analysis_id"
 			type="select"
 			dynamic_options="list_analyses()"
 			label="Analysis" />
 
 	    <!-- options -->
-		<param name="name" label="Name" argument="name" type="text" help="The name given to the phylotree entry in the database" />
-		<param name="xref_db" label="Xref db" argument="xref_db" value="null" type="text" help="The name of the db to link dbxrefs for the trees" />
-		<param name="xref_accession" label="Xref Accession" argument="xref_accession" type="text" help="The accession to use for dbxrefs for the trees (assumed same as name unless otherwise specified)" />
-		<param name="match_on_name" label="Match On Name" argument="match_on_name" type="boolean" truevalue="--match_on_name" falsevalue="" help="Match polypeptide features using their name instead of their uniquename" />
-		<param name="prefix" label="Prefix" argument="prefix" type="text" help="Comma-separated list of prefix to be removed from identifiers (e.g species prefixes when loading OrthoFinder output)" />
+		<param name="name" label="Name" argument="--name" type="text" help="The name given to the phylotree entry in the database" />
+		<param name="xref_db" label="Xref db" argument="--xref_db" value="null" type="text" help="The name of the db to link dbxrefs for the trees" />
+		<param name="xref_accession" label="Xref Accession" argument="--xref_accession" type="text" help="The accession to use for dbxrefs for the trees (assumed same as name unless otherwise specified)" />
+		<param name="match_on_name" label="Match On Name" argument="--match_on_name" type="boolean" truevalue="--match_on_name" falsevalue="" help="Match polypeptide features using their name instead of their uniquename" />
+		<param name="prefix" label="Prefix" argument="--prefix" type="text" help="Comma-separated list of prefix to be removed from identifiers (e.g species prefixes when loading OrthoFinder output)" />
 		<expand macro="wait_for"/>
 
 	</inputs>