Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for userdefined prefixes #439

Merged
merged 23 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bde56fa
Use prefix as arguemnt instead of namespace in get_by_label
francescalb Aug 11, 2022
8d1215a
Updated documentation with prefix for get_by_label
francescalb Aug 11, 2022
e84067c
Added automatic detection of prefix for the loaded ontology and tests
francescalb Aug 11, 2022
cb82c76
Corrected to that prefix actually cahcek for the prefix of the ontology
francescalb Aug 11, 2022
cf9d7a8
Added support for get_by_label('prefix:entity')
francescalb Aug 11, 2022
224fb57
Updated docstring of get_by_label
francescalb Aug 12, 2022
ec306e9
Merge branch 'master' into flb/fix-prefix
francescalb Aug 16, 2022
d76b91d
Added testonto to fixtures. This revealed a different issue that should
francescalb Aug 17, 2022
9ac54f2
Removed dependency on pydot
jesper-friis Aug 17, 2022
063e477
Apply suggestions from code review
jesper-friis Aug 17, 2022
7989cb6
Removed pydot from requirements
jesper-friis Aug 17, 2022
b0d64d3
Merge branch 'remove_pydot' into flb/fix-prefix
jesper-friis Aug 17, 2022
ed5686b
Updated so that label_annotations are taken care of even if load is not
francescalb Aug 17, 2022
2b21fcc
Merge branch 'flb/fix-prefix' of github.com:emmo-repo/EMMO-python int…
jesper-friis Aug 17, 2022
fe6a750
Removed old test_graph.py
jesper-friis Aug 17, 2022
cb570ac
Updated Ontology.get_unabbreviated_triples() to match changes in
jesper-friis Aug 17, 2022
909a645
Changes form pylint and blacken
jesper-friis Aug 17, 2022
0a834cc
Removed ontopy/ontograph.py
jesper-friis Aug 17, 2022
b597474
Removed docs for deleted ontograph
jesper-friis Aug 17, 2022
381cf0b
Fixed indentation in documentation
jesper-friis Aug 17, 2022
c86679d
Typo in docstring
jesper-friis Aug 17, 2022
e3dd4c0
Put prefix in init for Ontology and added emmo prefix tests
francescalb Aug 17, 2022
a1a5a43
Added asserts
jesper-friis Aug 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions demo/horizontal/step4_map_instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,11 @@ def map_app2common(instance, meta_collection, out_id=None):

# Load metadata collection from step 1
metacoll = dlite.Collection(
"json://usercase_metadata.json?mode=r#usercase_ontology", True
"json://usercase_metadata.json?mode=r#usercase_ontology"
)

# Load dlite-representation of atoms structure from step 3
coll = dlite.Collection(
"json://usercase_appdata.json?mode=r#usercase_appdata", False
)
coll = dlite.Collection("json://usercase_appdata.json?mode=r#usercase_appdata")
inst = coll.get("atoms")

# Do the mapping
Expand Down
3 changes: 0 additions & 3 deletions docs/api_reference/ontopy/ontograph.md

This file was deleted.

2 changes: 1 addition & 1 deletion emmopy/emmopy.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ def get_emmo(inferred: Optional[bool] = True) -> "Ontology":

"""
name = "emmo-inferred" if inferred in [True, None] else "emmo"
return get_ontology(name).load()
return get_ontology(name).load(prefix_emmo=True)
Loading