1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4615f7424dcb/ Changeset: 4615f7424dcb User: jmchilton Date: 2013-11-22 03:18:47 Summary: Fix API handling of tools containing repeat statement with min set. Affected #: 3 files diff -r f302dae15be9185139d8cc17cd0208a448e7e9b0 -r 4615f7424dcb4d2b61be5f388c761f45a1302a03 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -1982,6 +1982,7 @@ group_errors = [ ] any_group_errors = False rep_index = 0 + del group_state[:] # Clear prepopulated defaults if repeat.min set. while True: rep_name = "%s_%d" % ( key, rep_index ) if not any( [ incoming_key.startswith(rep_name) for incoming_key in incoming.keys() ] ): diff -r f302dae15be9185139d8cc17cd0208a448e7e9b0 -r 4615f7424dcb4d2b61be5f388c761f45a1302a03 test/functional/tools/min_repeat.xml --- /dev/null +++ b/test/functional/tools/min_repeat.xml @@ -0,0 +1,27 @@ +<tool id="min_repeat" name="min_repeat"> + <command> + cat #for $q in $queries# ${q.input} #end for# > $out_file1 ; + cat #for $q in $queries2# ${q.input2} #end for# > $out_file2 + </command> + <inputs> + <repeat name="queries" title="Dataset" min="1"> + <param name="input" type="data" label="Select" /> + </repeat> + <repeat name="queries2" title="Dataset" min="1"> + <param name="input2" type="data" label="Select" /> + </repeat> + </inputs> + <outputs> + <data name="out_file1" format="txt" /> + <data name="out_file2" format="txt" /> + </outputs> + <tests> + <test> + <param name="input" value="simple_line.txt"/> + <param name="input" value="simple_line.txt"/> + <param name="input2" value="simple_line_alternative.txt"/> + <output name="out_file1" file="simple_line_x2.txt"/> + <output name="out_file2" file="simple_line_alternative.txt"/> + </test> + </tests> +</tool> diff -r f302dae15be9185139d8cc17cd0208a448e7e9b0 -r 4615f7424dcb4d2b61be5f388c761f45a1302a03 test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -12,4 +12,5 @@ <tool file="metadata.xml" /><tool file="output_order.xml" /><tool file="disambiguate_repeats.xml" /> + <tool file="min_repeat.xml" /></toolbox> \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.