test out create markdown

HDRUK · Jun 7, 2024 · 1b95b21 · 1b95b21
1 parent 670ff98
commit 1b95b21
Show file tree

Hide file tree

Showing 9 changed files with 7,268 additions and 34 deletions.
diff --git a/docs/GWDM/2.0.form.json b/docs/GWDM/2.0.form.json
diff --git a/docs/GWDM/2.0.md b/docs/GWDM/2.0.md
diff --git a/docs/GWDM/2.0.structure.json b/docs/GWDM/2.0.structure.json
diff --git a/docs/HDRUK/3.0.0.form.json b/docs/HDRUK/3.0.0.form.json
diff --git a/docs/HDRUK/3.0.0.md b/docs/HDRUK/3.0.0.md
diff --git a/docs/HDRUK/3.0.0.structure.json b/docs/HDRUK/3.0.0.structure.json
diff --git a/hdr_schemata/models/HDRUK/v3_0_0/EnrichmentAndLinkage.py b/hdr_schemata/models/HDRUK/v3_0_0/EnrichmentAndLinkage.py
@@ -13,37 +13,21 @@ class EnrichmentAndLinkage(BaseModel):
     class Config:
         extra = "forbid"
 
-    derivedFrom: Optional[
-        Union[
-            Optional[CommaSeparatedValues], 
-            List[Optional[AbstractText]], 
-            List[DatasetDescriptor]
-        ]
-    ] = Field(None, **an.derivedFrom.__dict__)
-
-    isPartOf: Optional[
-        Union[
-            Optional[CommaSeparatedValues],
-            List[Union[Url, OneHundredFiftyCharacters]],
-            List[DatasetDescriptor]
-        ]
-    ] = Field(None, **an.isPartOf.__dict__)
-
-    linkableDatasets: Optional[
-        Union[
-            Optional[CommaSeparatedValues],
-            List[Union[Optional[Url], OneHundredFiftyCharacters]],
-            List[DatasetDescriptor]
-        ]
-    ] = Field(None, **an.linkableDatasets.__dict__)
-
-    similarToDatasets: Optional[
-        Union[
-            Optional[CommaSeparatedValues],
-            List[Union[Optional[Url], OneHundredFiftyCharacters]],
-            List[DatasetDescriptor]
-        ]
-    ] = Field(None, **an.linkableDatasets.__dict__)
+    derivedFrom: Optional[List[DatasetDescriptor]] = Field(
+        None, **an.derivedFrom.__dict__
+    )
+
+    isPartOf: Optional[List[DatasetDescriptor]] = Field(
+        None, **an.isPartOf.__dict__
+    )
+
+    linkableDatasets: Optional[List[DatasetDescriptor]] = Field(
+        None, **an.linkableDatasets.__dict__
+    )
+
+    similarToDatasets: Optional[List[DatasetDescriptor]] = Field(
+        None, **an.similarToDatasets.__dict__
+    )
 
     investigations: Optional[List[Url]] = Field(None, **an.investigations.__dict__)
 

diff --git a/hdr_schemata/models/HDRUK/v3_0_0/annotations/config.yaml b/hdr_schemata/models/HDRUK/v3_0_0/annotations/config.yaml
@@ -35,7 +35,7 @@ summary:
 
     name:
       description: The organisation responsible for running or supporting the data access request process, as well as publishing and maintaining the metadata.
-      title: Name of Data Provider
+      title: Name of data provider
 
     logo:
       description: Please provide a logo associated with the Gateway Organisation using a valid URL. The following formats will be accepted .jpg, .png or .svg.

diff --git a/hdr_schemata/utils/create_markdown.py b/hdr_schemata/utils/create_markdown.py
@@ -219,22 +219,27 @@ def remove_types(data):
 
 from hdr_schemata.models.HDRUK import Hdruk212
 from hdr_schemata.models.HDRUK import Hdruk213
-from hdr_schemata.models.HDRUK import Hdruk220
+from hdr_schemata.models.HDRUK import Hdruk220  
 from hdr_schemata.models.HDRUK import Hdruk221
+from hdr_schemata.models.HDRUK import Hdruk300
 from hdr_schemata.models.GWDM.v1_1 import Gwdm10
 from hdr_schemata.models.GWDM.v1_1 import Gwdm11
 from hdr_schemata.models.GWDM.v1_2 import Gwdm12
+from hdr_schemata.models.GWDM.v2_0 import Gwdm20
 
-
+  
 create_markdown(Hdruk220, "./docs/HDRUK/", "2.2.0")
 create_markdown(Hdruk221, "./docs/HDRUK/", "2.2.1")
 create_markdown(Hdruk212, "./docs/HDRUK/", "2.1.2")
 create_markdown(Hdruk213, "./docs/HDRUK/", "2.1.3")
+create_markdown(Hdruk300, "./docs/HDRUK/", "3.0.0")
 
 from hdr_schemata.models.GWDM.v1_1 import Gwdm10
 from hdr_schemata.models.GWDM.v1_1 import Gwdm11
 from hdr_schemata.models.GWDM.v1_2 import Gwdm12
+from hdr_schemata.models.GWDM.v2_0 import Gwdm20   
 
 create_markdown(Gwdm10, "./docs/GWDM/", "1.0")
 create_markdown(Gwdm11, "./docs/GWDM/", "1.1")
 create_markdown(Gwdm12, "./docs/GWDM/", "1.2")
+create_markdown(Gwdm20, "./docs/GWDM/", "2.0")