Skip to content

Commit

Permalink
Merge branch 'master' into CX-dec2023-infores-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
colleenXu committed Dec 14, 2023
2 parents 186f5f4 + 0795e3a commit 40be67e
Show file tree
Hide file tree
Showing 17 changed files with 21,971 additions and 21,782 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pr-verify-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
poetry run codespell
poetry run yamllint -c .yamllint-config biolink-model.yaml
poetry run yamllint -c .yamllint-config infores_catalog.yaml
make validate_infores
Expand Down
16 changes: 10 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,14 @@ gen-examples:
cp src/data/examples/* $(EXAMPLEDIR)

infores:
poetry run gen-python information-resource.yaml > information_resource.py
$(RUN) gen-python information-resource.yaml > information_resource.py

validate_infores:
$(RUN) python src/biolink_model/scripts/verify_infores.py

id-prefixes:
poetry run gen-python class_prefixes.yaml > src/biolink_model/scripts/classprefixes.py
cd src/biolink_model/scripts/ && poetry run python id_prefixes.py
$(RUN) gen-python class_prefixes.yaml > src/biolink_model/scripts/classprefixes.py
cd src/biolink_model/scripts/ && $(RUN) python id_prefixes.py

spell:
poetry run codespell
Expand All @@ -121,14 +124,15 @@ gen-project: $(PYMODEL)
--exclude sqlddl \
--include jsonldcontext \
--include jsonschema \
--include owl \
--exclude owl \
--include python \
--include rdf \
-d $(DEST) $(SOURCE_SCHEMA_PATH) && mv $(DEST)/*.py $(PYMODEL)
mv $(DEST)/prefixmap/biolink_model.yaml $(DEST)/prefixmap/biolink_model_prefix_map.json
mv $(PYMODEL)/biolink*.py $(PYMODEL)/model.py
$(RUN) gen-pydantic --pydantic_version 1 src/biolink_model/schema/biolink_model.yaml > $(PYMODEL)/pydanticmodel.py
$(RUN) gen-pydantic --pydantic_version 2 src/biolink_model/schema/biolink_model.yaml > $(PYMODEL)/pydanticmodel_v2.py
$(RUN) gen-pydantic --pydantic-version 1 src/biolink_model/schema/biolink_model.yaml > $(PYMODEL)/pydanticmodel.py
$(RUN) gen-pydantic --pydantic-version 2 src/biolink_model/schema/biolink_model.yaml > $(PYMODEL)/pydanticmodel_v2.py
$(RUN) gen-owl --mergeimports --no-metaclasses --no-type-objects --add-root-classes --mixins-as-expressions src/biolink_model/schema/biolink_model.yaml > $(DEST)/owl/biolink_model.owl.ttl
cp biolink-model.yaml src/biolink_model/schema/biolink_model.yaml
$(MAKE) id-prefixes infores

Expand Down
5 changes: 1 addition & 4 deletions biolink-model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1805,6 +1805,7 @@ slots:

superclass of:
is_a: related to at concept level
inverse: subclass of
description: >-
holds between two classes where the domain class is a super class of the range class
domain: ontology class
Expand Down Expand Up @@ -4237,10 +4238,6 @@ slots:
in_subset:
- translator_minimal
inverse: derives from
# TODO: fix this according to WG notes. Example of both opposite and inverse
# Commenting as it feels very wrong. A good example with both opposite and inverse is `has active ingredient`
# annotations:
# opposite_of: subclass of
exact_mappings:
- RO:0001001
- SEMMEDDB:CONVERTS_TO
Expand Down
Loading

0 comments on commit 40be67e

Please sign in to comment.