Merge pull request #148 from italia/cie-xsd

fix: [CIE] xsd updated
italia · Sep 12, 2022 · ad6c818 · ad6c818
2 parents 87c5982 + eb26dbf
commit ad6c818
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -31,7 +31,7 @@ jobs:
         python -m pip install --upgrade pip
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
-        python setup.py install
+        pip install .
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

diff --git a/src/spid_sp_test/__init__.py b/src/spid_sp_test/__init__.py
@@ -6,7 +6,7 @@
 
 
 BASE_DIR = Path(__file__).resolve().parent
-__version__ = "1.2.6"
+__version__ = "1.2.7"
 __name__ = "spid_sp_test"
 logger = logging.getLogger(__name__)
 

diff --git a/src/spid_sp_test/xsd/cie/cie.xsd b/src/spid_sp_test/xsd/cie/cie.xsd
@@ -29,7 +29,7 @@
 			<element ref="cie:Private"/>
 			<element ref="cie:VATNumber" minOccurs="0"/>
 			<element ref="cie:FiscalCode" minOccurs="0" />
-			<element ref="cie:NACE2Code" minOccurs="0" />
+			<element ref="cie:NACE2Code" minOccurs="0" maxOccurs="unbounded"/>
 		</sequence>
 	</group>
 

diff --git a/src/spid_sp_test/xsd/cie/saml-schema-metadata-sp-cie.xsd b/src/spid_sp_test/xsd/cie/saml-schema-metadata-sp-cie.xsd
@@ -111,6 +111,7 @@
             <element ref="md:SPSSODescriptor" minOccurs="1" maxOccurs="1"/>
             <element ref="md:Organization" minOccurs="1" maxOccurs="1"/>
             <element ref="md:ContactPerson" minOccurs="1" maxOccurs="2"/>
+            <element ref="md:Extensions" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="md:AdditionalMetadataLocation" minOccurs="0" maxOccurs="unbounded"/>
         </sequence>
         <attribute name="entityID" type="md:entityIDType" use="required"/>

diff --git a/src/spid_sp_test/xsd/cie/xml.xsd b/src/spid_sp_test/xsd/cie/xml.xsd
@@ -48,7 +48,14 @@
   </xs:documentation>
  </xs:annotation>
 
- <xs:attribute name="lang" type="xs:language">
+  <xs:simpleType name="language" id="language">
+    <xs:restriction base="xs:token">
+      <xs:pattern value="[a-zA-Z]{0,8}(-[a-zA-Z0-9]{1,8})*" id="language.pattern">
+      </xs:pattern>
+    </xs:restriction>
+  </xs:simpleType>
+
+ <xs:attribute name="lang" type="xml:language">
   <xs:annotation>
    <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
          codes as the enumerated possible values . . .</xs:documentation>