Merge pull request #196 from oarepo/edtf_import

edtf import fix
oarepo · Jul 3, 2023 · 2729524 · 2729524
2 parents 44f0e5f + 4394c2f
commit 2729524
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/oarepo_model_builder/datatypes/dates.py b/oarepo_model_builder/datatypes/dates.py
@@ -86,6 +86,8 @@ class EDTFDataType(BaseDateDataType):
         "imports": [
             {"import": "oarepo_runtime.validation.CachedMultilayerEDTFValidator"},
             {"import": "edtf.Date", "alias": "EDTFDate"},
+            {"import": "marshmallow_utils.fields.TrimmedString"},
+
         ],
     }
     mapping = {
@@ -110,6 +112,8 @@ class EDTFIntervalType(BaseDateDataType):
         "imports": [
             {"import": "oarepo_runtime.validation.CachedMultilayerEDTFValidator"},
             {"import": "edtf.Interval", "alias": "EDTFInterval"},
+            {"import": "marshmallow_utils.fields.TrimmedString"},
+
         ],
     }
     mapping = {

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder
-version = 4.0.21
+version = 4.0.22
 description = A utility library that generates OARepo required data model files from a JSON specification file
 authors = Miroslav Bauer <[email protected]>, Miroslav Simek <[email protected]>
 readme = README.md

diff --git a/tests/test_builder_from_entrypoints.py b/tests/test_builder_from_entrypoints.py
@@ -36,6 +36,7 @@ def test_include_invenio():
     data = builder.filesystem.open(
         os.path.join("test", "services", "records", "schema.py")
     ).read()
+
     assert (
         strip_whitespaces(
             """