-
Notifications
You must be signed in to change notification settings - Fork 29
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
Making prefix mapping less strict, fixes #702 #761
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ebcd75d
Making prefix mapping less strict, fixes #702
cmungall 958b5a3
format
cmungall a20ecfe
add missing
cmungall d8c394a
add missing
cmungall 5a5ec1f
fix GCI example
cmungall 2b15538
fixed docs
cmungall 246ca91
regenrate compliance test outputs
cmungall 861dc0c
Ensure prefixmap is not mutated
cmungall 4d1f4c3
relax test
cmungall 53c965c
fmt
cmungall File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
format-version: 1.2 | ||
ontology: test.obo | ||
idspace: dc http://purl.org/dc/elements/1.1/ | ||
idspace: oboInOwl http://www.geneontology.org/formats/oboInOwl# | ||
idspace: owl http://www.w3.org/2002/07/owl# | ||
idspace: rdf http://www.w3.org/1999/02/22-rdf-syntax-ns# | ||
idspace: rdfs http://www.w3.org/2000/01/rdf-schema# | ||
idspace: terms http://purl.org/dc/terms/ | ||
idspace: xml http://www.w3.org/XML/1998/namespace | ||
idspace: xsd http://www.w3.org/2001/XMLSchema# | ||
idspace: HP http://purl.obolibrary.org/obo/HP_ | ||
|
||
[Term] | ||
id: HP:0000001 | ||
name: All | ||
def: "." [PMID:1] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
.../obo-compliance/expansion-conflict-main-idspace/expansion-conflict-main-idspace.meta.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
name: expansion-conflict-main-idspace | ||
name: expansion-conflict-main-idspace | ||
description: tests conflicting expansions for the main ID space | ||
invalid: true | ||
seeAlso: https://github.com/INCATools/ontology-access-kit/issues/760 |
10 changes: 10 additions & 0 deletions
10
.../input/obo-compliance/expansion-conflict-main-idspace/expansion-conflict-main-idspace.obo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
format-version: 1.4 | ||
ontology: expansion-conflict-main-idspace | ||
idspace: X http://example.org/X/ | ||
idspace: X http://example.org/FAKEX/ | ||
|
||
[Term] | ||
id: X:1 | ||
name: X:1 | ||
|
||
|
31 changes: 31 additions & 0 deletions
31
tests/input/obo-compliance/gci-is-a/gci-is-a.expected.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ | ||
"graphs" : [ { | ||
"id" : "http://purl.obolibrary.org/obo/gci-is-a.owl", | ||
"meta" : { | ||
"basicPropertyValues" : [ { | ||
"pred" : "http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion", | ||
"val" : "1.4" | ||
} ] | ||
}, | ||
"nodes" : [ { | ||
"id" : "http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion", | ||
"lbl" : "has_obo_format_version", | ||
"type" : "PROPERTY" | ||
}, { | ||
"id" : "http://www.geneontology.org/formats/oboInOwl#id", | ||
"lbl" : "id", | ||
"type" : "PROPERTY" | ||
} ], | ||
"edges" : [ { | ||
"sub" : "http://purl.obolibrary.org/obo/X_1", | ||
"pred" : "is_a", | ||
"obj" : "http://purl.obolibrary.org/obo/X_2", | ||
"meta" : { | ||
"basicPropertyValues" : [ { | ||
"pred" : "http://www.geneontology.org/formats/oboInOwl#gci_predicate", | ||
"val" : "R:2" | ||
} ] | ||
} | ||
} ] | ||
} ] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
format-version: 1.2 | ||
ontology: gci-is-a | ||
|
||
[Term] | ||
id: X:1 | ||
is_a: X:2 {gci_predicate="R:2"} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
Prefix(:=<http://purl.obolibrary.org/obo/gci-is-a.owl#>) | ||
Prefix(owl:=<http://www.w3.org/2002/07/owl#>) | ||
Prefix(rdf:=<http://www.w3.org/1999/02/22-rdf-syntax-ns#>) | ||
Prefix(xml:=<http://www.w3.org/XML/1998/namespace>) | ||
Prefix(xsd:=<http://www.w3.org/2001/XMLSchema#>) | ||
Prefix(rdfs:=<http://www.w3.org/2000/01/rdf-schema#>) | ||
|
||
|
||
Ontology(<http://purl.obolibrary.org/obo/gci-is-a.owl> | ||
Annotation(<http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion> "1.4") | ||
|
||
Declaration(Class(<http://purl.obolibrary.org/obo/X_1>)) | ||
Declaration(Class(<http://purl.obolibrary.org/obo/X_2>)) | ||
Declaration(AnnotationProperty(<http://www.geneontology.org/formats/oboInOwl#gci_predicate>)) | ||
Declaration(AnnotationProperty(<http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion>)) | ||
Declaration(AnnotationProperty(<http://www.geneontology.org/formats/oboInOwl#id>)) | ||
############################ | ||
# Annotation Properties | ||
############################ | ||
|
||
# Annotation Property: <http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion> (has_obo_format_version) | ||
|
||
AnnotationAssertion(rdfs:label <http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion> "has_obo_format_version") | ||
|
||
# Annotation Property: <http://www.geneontology.org/formats/oboInOwl#id> (id) | ||
|
||
AnnotationAssertion(rdfs:label <http://www.geneontology.org/formats/oboInOwl#id> "id") | ||
|
||
|
||
|
||
############################ | ||
# Classes | ||
############################ | ||
|
||
# Class: <http://purl.obolibrary.org/obo/X_1> (<http://purl.obolibrary.org/obo/X_1>) | ||
|
||
AnnotationAssertion(<http://www.geneontology.org/formats/oboInOwl#id> <http://purl.obolibrary.org/obo/X_1> "X:1") | ||
SubClassOf(Annotation(<http://www.geneontology.org/formats/oboInOwl#gci_predicate> "R:2") <http://purl.obolibrary.org/obo/X_1> <http://purl.obolibrary.org/obo/X_2>) | ||
|
||
|
||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
<?xml version="1.0"?> | ||
<rdf:RDF xmlns="http://purl.obolibrary.org/obo/gci-is-a.owl#" | ||
xml:base="http://purl.obolibrary.org/obo/gci-is-a.owl" | ||
xmlns:owl="http://www.w3.org/2002/07/owl#" | ||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
xmlns:xml="http://www.w3.org/XML/1998/namespace" | ||
xmlns:xsd="http://www.w3.org/2001/XMLSchema#" | ||
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" | ||
xmlns:oboInOwl="http://www.geneontology.org/formats/oboInOwl#"> | ||
<owl:Ontology rdf:about="http://purl.obolibrary.org/obo/gci-is-a.owl"> | ||
<oboInOwl:hasOBOFormatVersion>1.4</oboInOwl:hasOBOFormatVersion> | ||
</owl:Ontology> | ||
|
||
|
||
|
||
<!-- | ||
/////////////////////////////////////////////////////////////////////////////////////// | ||
// | ||
// Annotation properties | ||
// | ||
/////////////////////////////////////////////////////////////////////////////////////// | ||
--> | ||
|
||
|
||
|
||
|
||
<!-- http://www.geneontology.org/formats/oboInOwl#gci_predicate --> | ||
|
||
<owl:AnnotationProperty rdf:about="http://www.geneontology.org/formats/oboInOwl#gci_predicate"/> | ||
|
||
|
||
|
||
<!-- http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion --> | ||
|
||
<owl:AnnotationProperty rdf:about="http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion"> | ||
<rdfs:label>has_obo_format_version</rdfs:label> | ||
</owl:AnnotationProperty> | ||
|
||
|
||
|
||
<!-- http://www.geneontology.org/formats/oboInOwl#id --> | ||
|
||
<owl:AnnotationProperty rdf:about="http://www.geneontology.org/formats/oboInOwl#id"> | ||
<rdfs:label>id</rdfs:label> | ||
</owl:AnnotationProperty> | ||
|
||
|
||
|
||
<!-- | ||
/////////////////////////////////////////////////////////////////////////////////////// | ||
// | ||
// Classes | ||
// | ||
/////////////////////////////////////////////////////////////////////////////////////// | ||
--> | ||
|
||
|
||
|
||
|
||
<!-- http://purl.obolibrary.org/obo/X_1 --> | ||
|
||
<owl:Class rdf:about="http://purl.obolibrary.org/obo/X_1"> | ||
<rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/X_2"/> | ||
<oboInOwl:id>X:1</oboInOwl:id> | ||
</owl:Class> | ||
<owl:Axiom> | ||
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/X_1"/> | ||
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/> | ||
<owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/X_2"/> | ||
<oboInOwl:gci_predicate>R:2</oboInOwl:gci_predicate> | ||
</owl:Axiom> | ||
|
||
|
||
|
||
<!-- http://purl.obolibrary.org/obo/X_2 --> | ||
|
||
<owl:Class rdf:about="http://purl.obolibrary.org/obo/X_2"/> | ||
</rdf:RDF> | ||
|
||
|
||
|
||
<!-- Generated by the OWL API (version 4.5.26) https://github.com/owlcs/owlapi --> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
name: gci-is-a | ||
name: gci-is-a | ||
description: General Class Inclusion is_a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
format-version: 1.4 | ||
ontology: gci-is-a | ||
|
||
[Term] | ||
id: X:1 | ||
is_a: X:2 {gci_relation="R:2", gci_filler="X:3"} | ||
|
31 changes: 31 additions & 0 deletions
31
tests/input/obo-compliance/gci-relation/gci-relation.expected.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ | ||
"graphs" : [ { | ||
"id" : "http://purl.obolibrary.org/obo/gci-relation.owl", | ||
"meta" : { | ||
"basicPropertyValues" : [ { | ||
"pred" : "http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion", | ||
"val" : "1.4" | ||
} ] | ||
}, | ||
"nodes" : [ { | ||
"id" : "http://www.geneontology.org/formats/oboInOwl#hasOBOFormatVersion", | ||
"lbl" : "has_obo_format_version", | ||
"type" : "PROPERTY" | ||
}, { | ||
"id" : "http://www.geneontology.org/formats/oboInOwl#id", | ||
"lbl" : "id", | ||
"type" : "PROPERTY" | ||
} ], | ||
"edges" : [ { | ||
"sub" : "http://purl.obolibrary.org/obo/X_1", | ||
"pred" : "http://purl.obolibrary.org/obo/R_1", | ||
"obj" : "http://purl.obolibrary.org/obo/X_2", | ||
"meta" : { | ||
"basicPropertyValues" : [ { | ||
"pred" : "http://www.geneontology.org/formats/oboInOwl#gci_predicate", | ||
"val" : "R:2" | ||
} ] | ||
} | ||
} ] | ||
} ] | ||
} |
7 changes: 7 additions & 0 deletions
7
tests/input/obo-compliance/gci-relation/gci-relation.expected.obo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
format-version: 1.2 | ||
ontology: gci-relation | ||
|
||
[Term] | ||
id: X:1 | ||
relationship: R:1 X:2 {gci_predicate="R:2"} | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this expected? Should it be
R:2 some X:2 subClassOf X:1
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is because the input file is using the wrong qualifier (see my other comment below).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch.
The main issue with this suite (as I mentioned here #751) is that it's self-bootstrapping there is a one-off TestByGuru run where both inputs and outputs need carefully checked against the spec.