opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_18.09' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2018-11-08 09:32:30 +00:00
parent d28ce7686d f85afad965
commit e4c00af38d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/schema_template.md
+1
View File
@@ -73,6 +73,7 @@ $tag:tool|outputs|collection|discover_datasets://complexType[@name='OutputCollec
$tag:tool|tests://complexType[@name='Tests']
$tag:tool|tests|test://complexType[@name='Test']
$tag:tool|tests|test|param://complexType[@name='TestParam']
$tag:tool|tests|test|param|collection://complexType[@name='TestCollection']
$tag:tool|tests|test|repeat://complexType[@name='TestRepeat']
$tag:tool|tests|test|section://complexType[@name='TestSection']
$tag:tool|tests|test|conditional://complexType[@name='TestConditional']
lib/galaxy/tools/xsd/galaxy.xsd
+8 -3
View File
@@ -359,7 +359,7 @@ Read more about configuring Galaxy to run Docker jobs
</xs:attribute>
<xs:attribute name="split_inputs" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">A comma separated list of data inputs to split for job parallelization.</xs:documentation>
<xs:documentation xml:lang="en">A comma-separated list of data inputs to split for job parallelization.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="split_size" type="xs:string">
@@ -374,7 +374,7 @@ Read more about configuring Galaxy to run Docker jobs
</xs:attribute>
<xs:attribute name="shared_inputs" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">A comma separated list of data inputs that should not be split for this tool, Galaxy will infer this if not present and so this potentially never needs to be set.</xs:documentation>
<xs:documentation xml:lang="en">A comma-separated list of data inputs that should not be split for this tool, Galaxy will infer this if not present and so this potentially never needs to be set.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
@@ -1119,6 +1119,11 @@ non-optional composite inputs must be specified as part of the ``param``.
<xs:documentation xml:lang="en">Type of collection to create.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="tags" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">Comma separated list of tags to apply to the dataset (only works for elements of collections - e.g. ``element`` XML tags).</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<xs:complexType name="TestOutput">
<xs:annotation>
@@ -2367,7 +2372,7 @@ file. Use the file extension.</xs:documentation>
This is only valid if ``type`` is ``data_collection``. Restrict the kind of
collection that can be consumed by this parameter (e.g. ``paired``,
``list:paired``, ``list``). Multiple such collection types can be specified here
as a comma separated list.
as a comma-separated list.
]]></xs:documentation>
</xs:annotation>