Merge pull request #7462 from martenson/tool-schema

fix syntax of xsd tool schema
galaxyproject · Mar 5, 2019 · abf3070 · abf3070
2 parents b990a77 + d27dceb
commit abf3070
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/lib/galaxy/tools/xsd/galaxy.xsd b/lib/galaxy/tools/xsd/galaxy.xsd
@@ -314,7 +314,7 @@ resolver.
 This tag set is contained within the 'requirements' tag set. Galaxy can be
 configured to run tools within [Docker](https://www.docker.com/) or [Singularity](https://www.sylabs.io/singularity/)
 containers - this tag allows the tool to suggest possible valid containers for this tool. The contents of the tag should
-be a container image identifier appropriate for the particular container runtime being used, e.g. 
+be a container image identifier appropriate for the particular container runtime being used, e.g.
 ``quay.io/biocontainers/fastqc:0.11.2--1`` for Docker or ``docker://quay.io/biocontainers/fastqc:0.11.2--1``
 (or alternatively ``/opt/containers/fastqc.simg`` if your Galaxy installation will be loading the image from a filesystem path)
 for Singularity. The ``requirements`` tag can contain multiple ``container`` tags describing suitable container options, in
@@ -1655,20 +1655,7 @@ module.
       </xs:element>
       <xs:element name="has_h5_attribute" type="AssertHasH5Attribute">
       </xs:element>
-      <xs:element name="has_archive_member">
-        <xs:complexType>
-          <xs:annotation>
-              <xs:documentation xml:lang="en"><![CDATA[This tag allows the developer to recursively specify additional assertions as child elements about just the member contained in the archive specified by the regular expression ``path`` (e.g. ``<has_archive_member path=".*/my-file.txt"><not_has_text text="EDK72998.1" /></has_archive_member>``). Valid archive formats include ``.zip``, ``.tar``, and ``.tar.gz``.]]></xs:documentation>
-          </xs:annotation>
-          <xs:sequence>
-            <xs:group ref="TestAssertion" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-          <xs:attribute name="path" type="xs:string">
-            <xs:annotation>
-              <xs:documentation xml:lang="en">The regular expression specifying the archive member.</xs:documentation>
-            </xs:annotation>
-          </xs:attribute>
-        </xs:complexType>
+      <xs:element name="has_archive_member" type="AssertHasArchiveMember">
       </xs:element>
     </xs:choice>
   </xs:group>
@@ -1697,6 +1684,19 @@ module.
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
+  <xs:complexType name="AssertHasArchiveMember">
+    <xs:annotation>
+        <xs:documentation xml:lang="en"><![CDATA[This tag allows the developer to recursively specify additional assertions as child elements about just the member contained in the archive specified by the regular expression ``path`` (e.g. ``<has_archive_member path=".*/my-file.txt"><not_has_text text="EDK72998.1" /></has_archive_member>``). Valid archive formats include ``.zip``, ``.tar``, and ``.tar.gz``.]]></xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:group ref="TestAssertion" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="path" type="xs:string">
+      <xs:annotation>
+        <xs:documentation xml:lang="en">The regular expression specifying the archive member.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
   <xs:complexType name="Inputs">
     <xs:annotation>
       <xs:documentation xml:lang="en"><![CDATA[Consists of all elements that define the