Skip to content

Commit

Permalink
Merge pull request #6983 from mvdbeek/schema_amamdment_tags_in_collec…
Browse files Browse the repository at this point in the history
…tion

[18.09] List tags as attribute of TestCollection
  • Loading branch information
jmchilton committed Nov 7, 2018
2 parents 6487d52 + 5e09885 commit 5e1fb9a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions doc/schema_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
11 changes: 8 additions & 3 deletions lib/galaxy/tools/xsd/galaxy.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,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">
Expand All @@ -362,7 +362,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>
Expand Down Expand Up @@ -1107,6 +1107,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>
Expand Down Expand Up @@ -2355,7 +2360,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>
Expand Down

0 comments on commit 5e1fb9a

Please sign in to comment.