feat!: ckan 2.11 support

Author: mutantsan

CHANGELOG.md

@@ -2,7 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [0.1.1](https://github.com/DataShades/ckanext-iso19115/compare/v0.1.0...v0.1.1) (2023-05-27)
+## [0.2.0](https://github.com/DataShades/ckanext-iso19115/compare/v0.1.1...v0.2.0) (2023-12-16)
+
+### ⚠ BREAKING CHANGES
+
+* CKAN v2.11 support
+
+
+## [0.1.1](https://github.com/DataShades/ckanext-iso19115/compare/v0.1.0...v0.1.1) (2023-05-27)
 
 
 ### Features

ckanext/iso19115/types/cit.py

@@ -93,7 +93,7 @@ class CI_Series:
 
 @dataclass
 class AbstractCI_Party:
-    name: gco.CharacterString = None
+    name: Optional[gco.CharacterString] = None
     contactInfo: Optional[list[CI_Contact]] = field(default_factory=list)
     partyIdentifier: Optional[list[mcc.MD_Identifier]] = field(default_factory=list)
 

ckanext/iso19115/types/gcx.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from dataclasses import Field, dataclass, field
-from typing import Optional
+from dataclasses import dataclass
+
 from .base import Atomic
 
 

ckanext/iso19115/types/gex.py

@@ -35,7 +35,7 @@ class AbstractEX_GeographicExtent:
 
 @dataclass
 class EX_GeographicDescription(AbstractEX_GeographicExtent):
-    geographicIdentifier: mcc.MD_Identifier = None
+    geographicIdentifier: Optional[mcc.MD_Identifier] = None
 
 
 @dataclass
@@ -45,7 +45,7 @@ class EX_BoundingPolygon(AbstractEX_GeographicExtent):
 
 @dataclass
 class EX_GeographicBoundingBox(AbstractEX_GeographicExtent):
-    westBoundLongitude: gco.Decimal = None
-    eastBoundLongitude: gco.Decimal = None
-    southBoundLatitude: gco.Decimal = None
-    northBoundLatitude: gco.Decimal = None
+    westBoundLongitude: Optional[gco.Decimal] = None
+    eastBoundLongitude: Optional[gco.Decimal] = None
+    southBoundLatitude: Optional[gco.Decimal] = None
+    northBoundLatitude: Optional[gco.Decimal] = None

ckanext/iso19115/types/lan.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Optional
 
 from .base import Codelist
@@ -28,4 +28,6 @@ class MD_CharacterSetCode(Codelist):
 class PT_Locale:
     language: Codelist[lan.LanguageCode]
     country: Optional[Codelist[lan.CountryCode]] = None
-    characterEncoding: Optional[Codelist[lan.MD_CharacterSetCode]] = "UTF-8"
+    characterEncoding: Optional[Codelist[lan.MD_CharacterSetCode]] = field(
+        default_factory=lambda: Codelist[lan.MD_CharacterSetCode]("UTF-8")
+    )

ckanext/iso19115/types/mac.py

@@ -52,8 +52,8 @@ class MI_PriorityCode(Codelist):
 @dataclass
 class MI_Revision:
     description: Optional[gco.CharacterString] = None
-    author: cit.CI_Responsibility = None
-    dateInfo: cit.CI_Date = None
+    author: Optional[cit.CI_Responsibility] = None
+    dateInfo: Optional[cit.CI_Date] = None
 
 
 @dataclass
@@ -73,8 +73,8 @@ class MI_Objective:
 @dataclass
 class MI_Plan:
     type: Optional[Codelist[mac.MI_GeometryTypeCode]] = None
-    status: Codelist[mcc.MD_ProgressCode] = None
-    citation: cit.CI_Citation = None
+    status: Optional[Codelist[mcc.MD_ProgressCode]] = None
+    citation: Optional[cit.CI_Citation] = None
     operation: Optional[list[mac.MI_Operation]] = field(default_factory=list)
     satisfiedRequirement: Optional[list[mac.MI_Requirement]] = field(
         default_factory=list
@@ -103,8 +103,8 @@ class MI_Event:
 @dataclass
 class MI_Platform:
     citation: Optional[list[cit.CI_Citation]] = field(default_factory=list)
-    identifier: mcc.MD_Identifier = None
-    description: gco.CharacterString = None
+    identifier: Optional[mcc.MD_Identifier] = None
+    description: Optional[gco.CharacterString] = None
     sponsor: Optional[list[cit.CI_Responsibility]] = field(default_factory=list)
     instrument: list[mac.MI_Instrument] = field(default_factory=list)
     otherPropertyType: Optional[gco.RecordType] = None
@@ -117,8 +117,8 @@ class MI_Platform:
 @dataclass
 class MI_Sensor:
     citation: Optional[list[cit.CI_Citation]] = field(default_factory=list)
-    identifier: mcc.MD_Identifier = None
-    type: gco.CharacterString = None
+    identifier: Optional[mcc.MD_Identifier] = None
+    type: Optional[gco.CharacterString] = None
     description: Optional[gco.CharacterString] = None
     mountedOn: Optional[mac.MI_Platform] = None
     otherPropertyType: Optional[gco.RecordType] = None
@@ -134,7 +134,7 @@ class MI_Sensor:
 @dataclass
 class MI_InstrumentationEvent:
     citation: Optional[list[cit.CI_Citation]] = field(default_factory=list)
-    description: gco.CharacterString = None
+    description: Optional[gco.CharacterString] = None
     extent: Optional[list[gex.EX_Extent]] = field(default_factory=list)
     type: list[Codelist[mac.MI_InstrumentationEventTypeCode]] = field(
         default_factory=list
@@ -158,8 +158,8 @@ class MI_InstrumentationEventList:
 @dataclass
 class MI_Instrument:
     citation: Optional[list[cit.CI_Citation]] = field(default_factory=list)
-    identifier: mcc.MD_Identifier = None
-    type: gco.CharacterString = None
+    identifier: Optional[mcc.MD_Identifier] = None
+    type: Optional[gco.CharacterString] = None
     description: Optional[gco.CharacterString] = None
     mountedOn: Optional[mac.MI_Platform] = None
     otherPropertyType: Optional[gco.RecordType] = None
@@ -176,7 +176,7 @@ class MI_Operation:
     description: Optional[gco.CharacterString] = None
     citation: Optional[cit.CI_Citation] = None
     identifier: Optional[mcc.MD_Identifier] = None
-    status: Codelist[mcc.MD_ProgressCode] = None
+    status: Optional[Codelist[mcc.MD_ProgressCode]] = None
     type: Optional[Codelist[mac.MI_OperationTypeCode]] = None
     parentOperation: Optional[mac.MI_Operation] = None
     childOperation: Optional[list[mac.MI_Operation]] = field(default_factory=list)
@@ -205,12 +205,12 @@ class MI_AcquisitionInformation:
 @dataclass
 class MI_Requirement:
     citation: Optional[cit.CI_Citation] = None
-    identifier: mcc.MD_Identifier = None
+    identifier: Optional[mcc.MD_Identifier] = None
     requestor: list[cit.CI_Responsibility] = field(default_factory=list)
     recipient: list[cit.CI_Responsibility] = field(default_factory=list)
-    priority: Codelist[mac.MI_PriorityCode] = None
-    requestedDate: mac.MI_RequestedDate = None
-    expiryDate: gco.DateTime = None
+    priority: Optional[Codelist[mac.MI_PriorityCode]] = None
+    requestedDate: Optional[mac.MI_RequestedDate] = None
+    expiryDate: Optional[gco.DateTime] = None
     satisifiedPlan: Optional[list[mac.MI_Plan]] = field(default_factory=list)
 
 

ckanext/iso19115/types/mcc.py

@@ -22,7 +22,7 @@ class MD_ProgressCode(Codelist):
 @dataclass
 class MD_Identifier:
     authority: Optional[cit.CI_Citation] = None
-    code: gco.CharacterString = None
+    code: Optional[gco.CharacterString] = None
     codeSpace: Optional[gco.CharacterString] = None
     version: Optional[gco.CharacterString] = None
     description: Optional[gco.CharacterString] = None

ckanext/iso19115/types/mdb.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 from .base import Codelist
 

ckanext/iso19115/types/mdq.py

@@ -166,23 +166,25 @@ class AbstractDQ_Result:
 
 @dataclass
 class QE_CoverageResult(AbstractDQ_Result):
-    spatialRepresentationType: Codelist[mcc.MD_SpatialRepresentationTypeCode] = None
-    resultFile: mdq.QualityResultFile = None
-    resultSpatialRepresentation: mcc.Abstract_SpatialRepresentation = None
-    resultContentDescription: mcc.Abstract_ContentInformation = None
-    resultFormat: mrd.MD_Format = None
+    spatialRepresentationType: Optional[
+        Codelist[mcc.MD_SpatialRepresentationTypeCode]
+    ] = None
+    resultFile: Optional[mdq.QualityResultFile] = None
+    resultSpatialRepresentation: Optional[mcc.Abstract_SpatialRepresentation] = None
+    resultContentDescription: Optional[mcc.Abstract_ContentInformation] = None
+    resultFormat: Optional[mrd.MD_Format] = None
 
 
 @dataclass
 class DQ_ConformanceResult(AbstractDQ_Result):
-    specification: cit.CI_Citation = None
+    specification: Optional[cit.CI_Citation] = None
     explanation: Optional[gco.CharacterString] = None
     # pass: gco.Boolean
 
 
 @dataclass
 class DQ_DescriptiveResult(AbstractDQ_Result):
-    statement: gco.CharacterString = None
+    statement: Optional[gco.CharacterString] = None
 
 
 @dataclass

ckanext/iso19115/types/mrc.py

@@ -49,7 +49,7 @@ class MD_FeatureCatalogueDescription(mcc.Abstract_ContentInformation):
 
 @dataclass
 class MD_CoverageDescription(mcc.Abstract_ContentInformation):
-    attributeDescription: gco.RecordType = None
+    attributeDescription: Optional[gco.RecordType] = None
     processingLevelCode: Optional[mcc.MD_Identifier] = None
     attributeGroup: Optional[list[mrc.MD_AttributeGroup]] = field(default_factory=list)