diff --git a/.gitmodules b/.gitmodules index a7b8c08e..2981416e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "submodules/vrs"] path = submodules/vrs url = https://github.com/ga4gh/vrs.git - branch = 2.1.0-snapshot.2026-02 + branch = 2.1 diff --git a/src/ga4gh/core/models.py b/src/ga4gh/core/models.py index 7492194b..571cb22d 100644 --- a/src/ga4gh/core/models.py +++ b/src/ga4gh/core/models.py @@ -22,9 +22,9 @@ class GKSCoreMetadataMixin(GKSMetadataMixin): - """Provide GKS-Core model metadata.""" + """Provide gkm-core model metadata.""" - _product_name = "gks-core" + _product_name = "gkm-core" _product_version = CORE_VERSION @@ -220,7 +220,7 @@ class ConceptMapping(GKSCoreMetadataMixin, Element, BaseModelForbidExtra): ) -class ConceptSet(GKSCoreMetadataMixin, Element, BaseModelForbidExtra): +class ConceptSet(GKSCoreMetadataMixin, Entity, BaseModelForbidExtra): """A set of concepts that may be considered as dependent (occurring together), or independent (existing separately) in the context of some knowledge reported about them, as indicated by a set membership operator. e.g. a set of independent molecular @@ -271,11 +271,15 @@ class Extension(GKSCoreMetadataMixin, Element, BaseModelForbidExtra): ) -class MappableConcept(GKSCoreMetadataMixin, Element, BaseModelForbidExtra): +class MappableConcept(GKSCoreMetadataMixin, Entity, BaseModelForbidExtra): """A concept based on a primaryCoding and/or name that may be mapped to one or more other `Codings`.""" _maturity: ClassVar[Maturity] = Maturity.TRIAL_USE + type: Literal["MappableConcept"] = Field( + default="MappableConcept", + description='MUST be "MappableConcept".', + ) conceptType: str | None = Field( # noqa: N815 default=None, description="A term indicating the type of concept being represented by the MappableConcept.", diff --git a/src/ga4gh/core/version.py b/src/ga4gh/core/version.py index 74c4d4f1..982aa6c9 100644 --- a/src/ga4gh/core/version.py +++ b/src/ga4gh/core/version.py @@ -1,3 +1,3 @@ -"""Define GKS-Core version""" +"""Define GKM-Core version""" -CORE_VERSION = "1.1.0" +CORE_VERSION = "1.2.0" diff --git a/src/ga4gh/vrs/version.py b/src/ga4gh/vrs/version.py index 281da683..00b1afa9 100644 --- a/src/ga4gh/vrs/version.py +++ b/src/ga4gh/vrs/version.py @@ -1,3 +1,3 @@ """Define VRS version""" -VRS_VERSION = "2.1.0-snapshot.2026-02.2" +VRS_VERSION = "2.1.0" diff --git a/submodules/vrs b/submodules/vrs index 83791ac4..cf33bfa7 160000 --- a/submodules/vrs +++ b/submodules/vrs @@ -1 +1 @@ -Subproject commit 83791ac4294a59ce48400eb66c34af86a12a3704 +Subproject commit cf33bfa7618011087655d5a5898e518c9d96bcdb diff --git a/tests/validation/test_model_metadata.py b/tests/validation/test_model_metadata.py index 77260795..5088531d 100644 --- a/tests/validation/test_model_metadata.py +++ b/tests/validation/test_model_metadata.py @@ -16,11 +16,11 @@ core_models, SUBMODULES_DIR / "submodules" - / "gks-core" + / "gkm-core" / "schema" - / "gks-core" - / "gks-core-source.yaml", - SUBMODULES_DIR / "submodules" / "gks-core" / "schema" / "gks-core" / "json", + / "gkm-core" + / "gkm-core-source.yaml", + SUBMODULES_DIR / "submodules" / "gkm-core" / "schema" / "gkm-core" / "json", ), ( vrs_models, diff --git a/tests/validation/test_schemas.py b/tests/validation/test_schemas.py index 88ad9591..322a30dc 100644 --- a/tests/validation/test_schemas.py +++ b/tests/validation/test_schemas.py @@ -61,7 +61,7 @@ def _update_gks_schema_mapping( # Get core classes core_mapping = GKS_SCHEMA_MAPPING[GKSSchema.CORE] for f in ( - SUBMODULES_DIR / "submodules" / "gks-core" / "schema" / "gks-core" / "json" + SUBMODULES_DIR / "submodules" / "gkm-core" / "schema" / "gkm-core" / "json" ).glob("*"): _update_gks_schema_mapping(f, core_mapping)