# HG changeset patch # User gga # Date 1529585329 14400 # Node ID a4901678ccfbbaa35f989b3874da85d088393f1f # Parent 4ab9c362351f973e4848ccdda6d9c7f40b2ca675 planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/tripal commit 81a83f06b49db32928ba0cd44e5b6d0431868d27 diff -r 4ab9c362351f -r a4901678ccfb README.rst --- a/README.rst Tue Sep 19 12:25:34 2017 -0400 +++ b/README.rst Thu Jun 21 08:48:49 2018 -0400 @@ -1,7 +1,7 @@ Galaxy-tripal ============= -Galaxy tools to interface with Tripal using pyhon-tripal +Galaxy tools to interface with Tripal using python-tripal Dependencies ------------ @@ -42,5 +42,4 @@ License ------- -All python scripts, wrappers, and the webapollo.py are licensed under -MIT license. +All python scripts and wrappers are licensed under MIT license. diff -r 4ab9c362351f -r a4901678ccfb analysis_load_interpro.xml --- a/analysis_load_interpro.xml Tue Sep 19 12:25:34 2017 -0400 +++ b/analysis_load_interpro.xml Thu Jun 21 08:48:49 2018 -0400 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool id="analysis_load_interpro" profile="16.04" name="Load InterProScan results" version="@WRAPPER_VERSION@.0"> +<tool id="analysis_load_interpro" profile="16.04" name="Load InterProScan results" version="@WRAPPER_VERSION@.1"> <description>into Tripal</description> <macros> <import>macros.xml</import> @@ -52,6 +52,7 @@ <expand macro="matching"/> <expand macro="analysis" /> + <expand macro="wait_for"/> </inputs> <outputs> <data format="txt" name="results" label="Load InterProScan results into Tripal" /> diff -r 4ab9c362351f -r a4901678ccfb macros.xml --- a/macros.xml Tue Sep 19 12:25:34 2017 -0400 +++ b/macros.xml Thu Jun 21 08:48:49 2018 -0400 @@ -50,6 +50,15 @@ TRIPAILLE_GLOBAL_CONFIG_PATH='.auth.yml' ]]></token> + <xml name="wait_for"> + <param name="wait_for" + type="data" + format="data" + optional="true" + label="Run this only after the following dataset is ready" + help="Use this if you want to delay the job execution until some data is already loaded. The selected dataset will not be used for anything else."/> + </xml> + <xml name="test_result"> <assert_stderr> <has_text text="MissingSchema" /> diff -r 4ab9c362351f -r a4901678ccfb tripal.py --- a/tripal.py Tue Sep 19 12:25:34 2017 -0400 +++ b/tripal.py Thu Jun 21 08:48:49 2018 -0400 @@ -1,7 +1,6 @@ import collections import os import time - from abc import abstractmethod import tripal