Merge pull request #165 from strictdoc-project/stanislaw/fix_xmlschem…

…a_setup Update ReqIF schemas to the recently updated xmlschema
strictdoc-project · Apr 27, 2024 · 3b1c923 · 3b1c923
2 parents 6ea9a66 + 4e3976d
commit 3b1c923
Show file tree

Hide file tree

Showing 25 changed files with 21 additions and 25 deletions.
diff --git a/.python-version b/.python-version
@@ -1,2 +1,2 @@
-3.7.15
+3.7
 
diff --git a/...ww.omg.org/spec/ReqIF/20110402/driver.xsd → ...ww.omg.org/spec/ReqIF/20110402/driver.xsd b/...ww.omg.org/spec/ReqIF/20110402/driver.xsd → ...ww.omg.org/spec/ReqIF/20110402/driver.xsd
@@ -6,20 +6,20 @@
     xmlns="http://www.w3.org/1999/xhtml"
     elementFormDefault="qualified" >
 
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="" />
 
     <xsd:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
-    	schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-datatypes-1.xsd" />
+    	schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-datatypes-1.xsd" />
 
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-framework-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-text-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-hypertext-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-list-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-edit-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-pres-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstyle-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-object-1.xsd" />
-    <xsd:include schemaLocation="reqif/reqif_schema/www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-table-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-framework-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-text-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-hypertext-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-list-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-edit-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-pres-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-inlstyle-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-object-1.xsd" />
+    <xsd:include schemaLocation="../../../../www.w3.org/TR/xhtml-modularization/SCHEMA/xhtml-table-1.xsd" />
 
     <xsd:attributeGroup name="xhtml.I18n.extra.attrib"/>
 

diff --git a/...modularization/SCHEMA/xhtml-attribs-1.xsd → ...modularization/SCHEMA/xhtml-attribs-1.xsd b/...modularization/SCHEMA/xhtml-attribs-1.xsd → ...modularization/SCHEMA/xhtml-attribs-1.xsd
@@ -16,7 +16,7 @@
         <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
     </xs:annotation>
   <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="http://www.w3.org/2001/xml.xsd">
+             schemaLocation="">
         <xs:annotation>
             <xs:documentation>
         This import brings in the XML namespace attributes

diff --git a/...odularization/SCHEMA/xhtml-blkphras-1.xsd → ...odularization/SCHEMA/xhtml-blkphras-1.xsd b/...odularization/SCHEMA/xhtml-blkphras-1.xsd → ...odularization/SCHEMA/xhtml-blkphras-1.xsd
@@ -27,7 +27,7 @@
         <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_textmodule"/>
     </xs:annotation>
   <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="http://www.w3.org/2001/xml.xsd">
+             schemaLocation="">
         <xs:annotation>
             <xs:documentation>
           This import brings in the XML namespace attributes 

diff --git a/...modularization/SCHEMA/xhtml-blkpres-1.xsd → ...modularization/SCHEMA/xhtml-blkpres-1.xsd b/...modularization/SCHEMA/xhtml-blkpres-1.xsd → ...modularization/SCHEMA/xhtml-blkpres-1.xsd
diff --git a/...dularization/SCHEMA/xhtml-blkstruct-1.xsd → ...dularization/SCHEMA/xhtml-blkstruct-1.xsd b/...dularization/SCHEMA/xhtml-blkstruct-1.xsd → ...dularization/SCHEMA/xhtml-blkstruct-1.xsd
diff --git a/...dularization/SCHEMA/xhtml-datatypes-1.xsd → ...dularization/SCHEMA/xhtml-datatypes-1.xsd b/...dularization/SCHEMA/xhtml-datatypes-1.xsd → ...dularization/SCHEMA/xhtml-datatypes-1.xsd
diff --git a/...ml-modularization/SCHEMA/xhtml-edit-1.xsd → ...ml-modularization/SCHEMA/xhtml-edit-1.xsd b/...ml-modularization/SCHEMA/xhtml-edit-1.xsd → ...ml-modularization/SCHEMA/xhtml-edit-1.xsd
diff --git a/...dularization/SCHEMA/xhtml-framework-1.xsd → ...dularization/SCHEMA/xhtml-framework-1.xsd b/...dularization/SCHEMA/xhtml-framework-1.xsd → ...dularization/SCHEMA/xhtml-framework-1.xsd
diff --git a/...dularization/SCHEMA/xhtml-hypertext-1.xsd → ...dularization/SCHEMA/xhtml-hypertext-1.xsd b/...dularization/SCHEMA/xhtml-hypertext-1.xsd → ...dularization/SCHEMA/xhtml-hypertext-1.xsd
diff --git a/...odularization/SCHEMA/xhtml-inlphras-1.xsd → ...odularization/SCHEMA/xhtml-inlphras-1.xsd b/...odularization/SCHEMA/xhtml-inlphras-1.xsd → ...odularization/SCHEMA/xhtml-inlphras-1.xsd
diff --git a/...modularization/SCHEMA/xhtml-inlpres-1.xsd → ...modularization/SCHEMA/xhtml-inlpres-1.xsd b/...modularization/SCHEMA/xhtml-inlpres-1.xsd → ...modularization/SCHEMA/xhtml-inlpres-1.xsd
diff --git a/...dularization/SCHEMA/xhtml-inlstruct-1.xsd → ...dularization/SCHEMA/xhtml-inlstruct-1.xsd b/...dularization/SCHEMA/xhtml-inlstruct-1.xsd → ...dularization/SCHEMA/xhtml-inlstruct-1.xsd
diff --git a/...odularization/SCHEMA/xhtml-inlstyle-1.xsd → ...odularization/SCHEMA/xhtml-inlstyle-1.xsd b/...odularization/SCHEMA/xhtml-inlstyle-1.xsd → ...odularization/SCHEMA/xhtml-inlstyle-1.xsd
diff --git a/...ml-modularization/SCHEMA/xhtml-list-1.xsd → ...ml-modularization/SCHEMA/xhtml-list-1.xsd b/...ml-modularization/SCHEMA/xhtml-list-1.xsd → ...ml-modularization/SCHEMA/xhtml-list-1.xsd
diff --git a/...-modularization/SCHEMA/xhtml-object-1.xsd → ...-modularization/SCHEMA/xhtml-object-1.xsd b/...-modularization/SCHEMA/xhtml-object-1.xsd → ...-modularization/SCHEMA/xhtml-object-1.xsd
diff --git a/...l-modularization/SCHEMA/xhtml-param-1.xsd → ...l-modularization/SCHEMA/xhtml-param-1.xsd b/...l-modularization/SCHEMA/xhtml-param-1.xsd → ...l-modularization/SCHEMA/xhtml-param-1.xsd
diff --git a/...ml-modularization/SCHEMA/xhtml-pres-1.xsd → ...ml-modularization/SCHEMA/xhtml-pres-1.xsd b/...ml-modularization/SCHEMA/xhtml-pres-1.xsd → ...ml-modularization/SCHEMA/xhtml-pres-1.xsd
diff --git a/...l-modularization/SCHEMA/xhtml-table-1.xsd → ...l-modularization/SCHEMA/xhtml-table-1.xsd b/...l-modularization/SCHEMA/xhtml-table-1.xsd → ...l-modularization/SCHEMA/xhtml-table-1.xsd
diff --git a/...ml-modularization/SCHEMA/xhtml-text-1.xsd → ...ml-modularization/SCHEMA/xhtml-text-1.xsd b/...ml-modularization/SCHEMA/xhtml-text-1.xsd → ...ml-modularization/SCHEMA/xhtml-text-1.xsd
diff --git a/reqif/reqif_schema/reqif.xsd b/reqif/reqif_schema/reqif.xsd
@@ -3,8 +3,8 @@
     xmlns="http://www.w3.org/1999/xhtml" xmlns:REQIF="http://www.omg.org/spec/ReqIF/20110401/reqif.xsd"
     xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified"
     elementFormDefault="qualified" targetNamespace="http://www.omg.org/spec/ReqIF/20110401/reqif.xsd">
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <xsd:import namespace="http://www.w3.org/1999/xhtml" schemaLocation="reqif/reqif_schema/www.omg.org/spec/ReqIF/20110402/driver.xsd"/>
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation=""/>
+  <xsd:import namespace="http://www.w3.org/1999/xhtml" schemaLocation="http/www.omg.org/spec/ReqIF/20110402/driver.xsd"/>
   <xsd:element name="REQ-IF" type="REQIF:REQ-IF"/>
   <xsd:simpleType name="LOCAL-REF">
     <xsd:restriction base="xsd:IDREF"/>

diff --git a/tasks.py b/tasks.py
@@ -1,9 +1,14 @@
+import inspect
 import os
 import re
 
 import invoke
 from invoke import task
 
+# FIXME
+if not hasattr(inspect, "getargspec"):
+    inspect.getargspec = inspect.getfullargspec
+
 
 def one_line_command(string):
     return re.sub("\\s+", " ", string).strip()

diff --git a/...ntegration/commands/validate/_xsd_schema_validation/01_incorrect_reqif_version/test.itest b/...ntegration/commands/validate/_xsd_schema_validation/01_incorrect_reqif_version/test.itest
@@ -1,5 +1,2 @@
-# FIXME
-UNSUPPORTED: true
-
 RUN: %expect_exit 1 %reqif validate --use-reqif-schema %S/sample.reqif | filecheck %s --dump-input=fail
 CHECK: Reason: must have the fixed value '1.0'
diff --git a/...ntegration/commands/validate/_xsd_schema_validation/02_invalid_is_editable_tag/test.itest b/...ntegration/commands/validate/_xsd_schema_validation/02_invalid_is_editable_tag/test.itest
@@ -1,5 +1,2 @@
-# FIXME
-UNSUPPORTED: true
-
 RUN: %expect_exit 1 %reqif validate --use-reqif-schema %S/sample.reqif | filecheck %s --dump-input=fail
 CHECK: Reason: Unexpected child with tag 'REQIF:IS-EDITABLE' at position 2.
diff --git a/...integration/commands/validate/_xsd_schema_validation/03_invalid_table_internal/test.itest b/...integration/commands/validate/_xsd_schema_validation/03_invalid_table_internal/test.itest
@@ -1,5 +1,2 @@
-# FIXME
-UNSUPPORTED: true
-
 RUN: %expect_exit 1 %reqif validate --use-reqif-schema %S/sample.reqif | filecheck %s --dump-input=fail
 CHECK: Reason: Unexpected child with tag 'REQIF:IS-TABLE-INTERNAL' at position 1. Tag 'REQIF:OBJECT' expected.