Remove space in xsi:schemaLocation; more docs

ModECI · Aug 15, 2023 · c47685f · c47685f
1 parent 024ea24
commit c47685f
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 21 deletions.
diff --git a/examples/neuroml2/NeuroML2.md b/examples/neuroml2/NeuroML2.md
@@ -13,7 +13,21 @@ Some description...
   <tr>
     <td><b>xmlns</b></td>
     <td>str</td>
-    <td><i>Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2</i></td>
+    <td><i>Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2</i></td>
+ </tr>
+
+
+  <tr>
+    <td><b>xmlns_xsi</b></td>
+    <td>str</td>
+    <td><i>Namespace for XMLSchema-instance</i></td>
+ </tr>
+
+
+  <tr>
+    <td><b>xmlns_loc</b></td>
+    <td>str</td>
+    <td><i>Specifies location of the main namespace</i></td>
  </tr>
 
 
@@ -24,14 +38,14 @@ Some description...
   <tr>
     <td><b>izhikevich2007Cells</b></td>
     <td><a href="#izhikevich2007cell">izhikevich2007Cell</a></td>
-    <td><i></i></td>
+    <td><i>The izhikevich2007Cells</i></td>
   </tr>
 
 
   <tr>
     <td><b>pulseGenerators</b></td>
     <td><a href="#pulsegenerator">pulseGenerator</a></td>
-    <td><i></i></td>
+    <td><i>The pulse current generators</i></td>
   </tr>
 
 

diff --git a/examples/neuroml2/NeuroML2.rst b/examples/neuroml2/NeuroML2.rst
@@ -5,22 +5,24 @@ Some description...
 
 **Allowed parameters**
 
-===============  ===========  ====================================================================
+===============  ===========  ======================================================================================
 Allowed field    Data Type    Description
-===============  ===========  ====================================================================
+===============  ===========  ======================================================================================
 **id**           str          The id of the NeuroML 2 document
-**xmlns**        str          Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2
-===============  ===========  ====================================================================
+**xmlns**        str          Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2
+**xmlns_xsi**    str          Namespace for XMLSchema-instance
+**xmlns_loc**    str          Specifies location of the main namespace
+===============  ===========  ======================================================================================
 
 **Allowed children**
 
-=======================  ============================================  ====================
+=======================  ============================================  ============================
 Allowed child            Data Type                                     Description
-=======================  ============================================  ====================
-**izhikevich2007Cells**  `izhikevich2007Cell <#izhikevich2007cell>`__
-**pulseGenerators**      `pulseGenerator <#pulsegenerator>`__
+=======================  ============================================  ============================
+**izhikevich2007Cells**  `izhikevich2007Cell <#izhikevich2007cell>`__  The izhikevich2007Cells
+**pulseGenerators**      `pulseGenerator <#pulsegenerator>`__          The pulse current generators
 **networks**             `network <#network>`__                        The networks present
-=======================  ============================================  ====================
+=======================  ============================================  ============================
 
 ==================
 izhikevich2007Cell

diff --git a/examples/neuroml2/NeuroML2.specification.json b/examples/neuroml2/NeuroML2.specification.json
@@ -8,17 +8,25 @@
             },
             "xmlns": {
                 "type": "str",
-                "description": "Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2"
+                "description": "Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2"
+            },
+            "xmlns_xsi": {
+                "type": "str",
+                "description": "Namespace for XMLSchema-instance"
+            },
+            "xmlns_loc": {
+                "type": "str",
+                "description": "Specifies location of the main namespace"
             }
         },
         "allowed_children": {
             "izhikevich2007Cells": {
                 "type": "izhikevich2007Cell",
-                "description": ""
+                "description": "The izhikevich2007Cells"
             },
             "pulseGenerators": {
                 "type": "pulseGenerator",
-                "description": ""
+                "description": "The pulse current generators"
             },
             "networks": {
                 "type": "network",

diff --git a/examples/neuroml2/NeuroML2.specification.yaml b/examples/neuroml2/NeuroML2.specification.yaml
@@ -6,14 +6,20 @@ neuroml:
             description: The id of the NeuroML 2 document
         xmlns:
             type: str
-            description: Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2
+            description: Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2
+        xmlns_xsi:
+            type: str
+            description: Namespace for XMLSchema-instance
+        xmlns_loc:
+            type: str
+            description: Specifies location of the main namespace
     allowed_children:
         izhikevich2007Cells:
             type: izhikevich2007Cell
-            description: ''
+            description: The izhikevich2007Cells
         pulseGenerators:
             type: pulseGenerator
-            description: ''
+            description: The pulse current generators
         networks:
             type: network
             description: The networks present

diff --git a/examples/neuroml2/TestNeuroML.xml b/examples/neuroml2/TestNeuroML.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="TestNeuroML" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="TestNeuroML" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd">
     <izhikevich2007Cell id="izh2007RS0" C="100pF" v0="-60mV" k="0.7nS_per_mV" vr="-60mV" vt="-40mV" vpeak="35mV" a="0.03per_ms" b="-2nS" c="-50.0mV" d="100pA"/>
     <pulseGenerator id="pulseGen_0" delay="100ms" duration="800ms" amplitude="0.07 nA"/>
     <network id="IzNet">

diff --git a/examples/neuroml2/neuroml2_spec.py b/examples/neuroml2/neuroml2_spec.py
@@ -101,11 +101,16 @@ class neuroml(Base):
 
     Args:
         id: The id of the NeuroML 2 document
-        xmlns: Schema for NeuroML 2, usually http://www.neuroml.org/schema/neuroml2
+        xmlns: Default namespace for the NeuroML file, usually http://www.neuroml.org/schema/neuroml2
+        xmlns_xsi: Namespace for XMLSchema-instance
+        xmlns_loc: Specifies location of the main namespace
+        izhikevich2007Cells: The izhikevich2007Cells
+        pulseGenerators: The pulse current generators
         networks: The networks present
     """
 
     id: str = field(validator=instance_of(str))
+
     xmlns: str = field(
         validator=instance_of(str), default="http://www.neuroml.org/schema/neuroml2"
     )
@@ -114,7 +119,7 @@ class neuroml(Base):
     )
     xmlns_loc: str = field(
         validator=instance_of(str),
-        default="http://www.neuroml.org/schema/neuroml2https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd",
+        default="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd",
     )
 
     izhikevich2007Cells: List[izhikevich2007Cell] = field(factory=list)