diff --git a/dandischema/consts.py b/dandischema/consts.py index 595e578..5d1146e 100644 --- a/dandischema/consts.py +++ b/dandischema/consts.py @@ -1,4 +1,4 @@ -DANDI_SCHEMA_VERSION = "0.6.9" +DANDI_SCHEMA_VERSION = "0.6.10" ALLOWED_INPUT_SCHEMAS = [ "0.4.4", "0.5.1", @@ -12,6 +12,7 @@ "0.6.6", "0.6.7", "0.6.8", + "0.6.9", DANDI_SCHEMA_VERSION, ] diff --git a/dandischema/models.py b/dandischema/models.py index bef8cf2..2d1580d 100644 --- a/dandischema/models.py +++ b/dandischema/models.py @@ -966,7 +966,7 @@ class Person(Contributor): class Software(DandiBaseModel): identifier: Optional[RRID] = Field( None, - pattern=r"^RRID\:.*", + pattern=r"^RRID:.*", title="Research resource identifier", description="RRID of the software from scicrunch.org.", json_schema_extra={"nskey": "schema"}, @@ -1612,7 +1612,7 @@ def contributor_musthave_contact( identifier: DANDI = Field( title="Dandiset identifier", description="A Dandiset identifier that can be resolved by identifiers.org.", - pattern=r"^DANDI\:\d{6}$", + pattern=r"^DANDI:\d{6}$", json_schema_extra={"readOnly": True, "nskey": "schema"}, ) name: str = Field( diff --git a/dandischema/tests/test_metadata.py b/dandischema/tests/test_metadata.py index b85b3ef..ce10b10 100644 --- a/dandischema/tests/test_metadata.py +++ b/dandischema/tests/test_metadata.py @@ -429,7 +429,14 @@ def test_migrate_044(schema_dir: Path) -> None: ] # if already the target version - we do not change it, and do not crash - newmeta_2 = migrate(newmeta, to_version=DANDI_SCHEMA_VERSION) + newmeta_2 = migrate( + newmeta, + to_version=DANDI_SCHEMA_VERSION, + # to avoid possible crash due to attempt to download not yet + # released schema if we are still working within yet to be + # released version of the schema + skip_validation=True, + ) assert newmeta_2 == newmeta assert newmeta_2 is not newmeta # but we do create a copy