Skip to content

Commit b3200ac

Browse files
authored
Merge branch 'master' into 3427-epithelium-of-anorectum
2 parents 4c5390b + 1703c1b commit b3200ac

7 files changed

Lines changed: 20 additions & 35 deletions

File tree

.github/workflows/diff.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
needs: [branch_status]
6262
if: ${{ github.event.issue.pull_request }}
6363
runs-on: ubuntu-latest
64-
container: obolibrary/odkfull:v1.5.3
64+
container: obolibrary/odkfull:v1.5.4
6565
steps:
6666
- uses: khan/pull-request-comment-trigger@v1.1.0
6767
id: check
@@ -94,7 +94,7 @@ jobs:
9494
needs: [branch_status]
9595
if: ${{ github.event.issue.pull_request }}
9696
runs-on: ubuntu-latest
97-
container: obolibrary/odkfull:v1.5.3
97+
container: obolibrary/odkfull:v1.5.4
9898
steps:
9999
- uses: khan/pull-request-comment-trigger@v1.1.0
100100
id: check
@@ -122,7 +122,7 @@ jobs:
122122
needs: [branch_status]
123123
if: ${{ github.event.issue.pull_request }}
124124
runs-on: ubuntu-latest
125-
container: obolibrary/odkfull:v1.5.3
125+
container: obolibrary/odkfull:v1.5.4
126126
steps:
127127
- uses: khan/pull-request-comment-trigger@v1.1.0
128128
id: check
@@ -147,7 +147,7 @@ jobs:
147147
diff_classification:
148148
needs: [classify_branch, classify_main]
149149
runs-on: ubuntu-latest
150-
container: obolibrary/odkfull:v1.5.3
150+
container: obolibrary/odkfull:v1.5.4
151151
steps:
152152
- uses: khan/pull-request-comment-trigger@v1.1.0
153153
id: check

.github/workflows/qc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
ontology_qc:
2424
# The type of runner that the job will run on
2525
runs-on: ubuntu-latest
26-
container: obolibrary/odkfull:v1.5.3
26+
container: obolibrary/odkfull:v1.5.4
2727
# Steps represent a sequence of tasks that will be executed as part of the job
2828
steps:
2929
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

src/ontology/catalog-v001.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<uri name="http://purl.obolibrary.org/obo/uberon/bridge/uberon-bridge-to-wbbt.owl" uri="bridge/uberon-bridge-to-wbbt.owl"/>
4444
<uri name="http://purl.obolibrary.org/obo/uberon/bridge/uberon-bridge-to-wbls.owl" uri="bridge/uberon-bridge-to-wbls.owl"/>
4545
<uri name="http://purl.obolibrary.org/obo/uberon/bridge/uberon-bridge-to-xao.owl" uri="bridge/uberon-bridge-to-xao.owl"/>
46-
<uri name="http://purl.obolibrary.org/obo/uberon/components/develops-from-chains.owl" uri="components/develops-from-chains.owl"/>
4746
<uri name="http://purl.obolibrary.org/obo/uberon/components/disjoint_union_over.owl" uri="components/disjoint_union_over.owl"/>
4847
<uri name="http://purl.obolibrary.org/obo/uberon/components/hra_depiction_3d_images.owl" uri="components/hra_depiction_3d_images.owl"/>
4948
<uri name="http://purl.obolibrary.org/obo/uberon/components/hra_subset.owl" uri="components/hra_subset.owl"/>

src/ontology/components/develops-from-chains.owl

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/ontology/uberon-edit.obo

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ treat-xrefs-as-equivalent: VSAO
5656
treat-xrefs-as-is_a: BFO
5757
treat-xrefs-as-is_a: VHOG
5858
remark: Aurelie Comte, Bill Bug, Catherine Leroy, Duncan Davidson and Trish Whetzel are also contributors. However their ORCIDs were not found.
59-
import: http://purl.obolibrary.org/obo/uberon/components/develops-from-chains.owl
6059
import: http://purl.obolibrary.org/obo/uberon/components/disjoint_union_over.owl
6160
import: http://purl.obolibrary.org/obo/uberon/components/hra_depiction_3d_images.owl
6261
import: http://purl.obolibrary.org/obo/uberon/components/hra_subset.owl
@@ -2885,13 +2884,13 @@ relationship: simultaneous_with GO:0007369 ! gastrulation
28852884
[Term]
28862885
id: UBERON:0000110
28872886
name: neurula stage
2888-
def: "Staged defined by the formation of a tube from the flat layer of ectodermal cells known as the neural plate. This will give rise to the central nervous system." [GO:0001841]
2887+
def: "A chordate developmental stage defined by the formation of a tube from the flat layer of ectodermal cells known as the neural plate. This will give rise to the central nervous system." [GO:0001841]
28892888
xref: BilaDO:0000009
28902889
xref: BILS:0000110
28912890
xref: XAO:1000006
28922891
is_a: UBERON:0000105 ! life cycle stage
28932892
relationship: dubious_for_taxon NCBITaxon:7955 ! Danio rerio
2894-
relationship: in_taxon NCBITaxon:6072 ! Eumetazoa
2893+
relationship: in_taxon NCBITaxon:7711 ! Chordata
28952894
relationship: part_of UBERON:0000068 ! embryo stage
28962895
relationship: preceded_by UBERON:0000109 ! gastrula stage
28972896
relationship: simultaneous_with GO:0001841 ! neural tube formation
@@ -30592,11 +30591,10 @@ xref: SCTID:280648000
3059230591
xref: UMLS:C0042160 {source="ncithesaurus:Uvea"}
3059330592
xref: Wikipedia:Uvea
3059430593
is_a: UBERON:0004923 {source="FMA"} ! organ component layer
30595-
relationship: contributes_to_morphology_of UBERON:0000019 ! camera-type eye
3059630594
relationship: has_part UBERON:0001769 ! iris
3059730595
relationship: has_part UBERON:0001775 ! ciliary body
3059830596
relationship: has_part UBERON:0001776 ! optic choroid
30599-
relationship: part_of UBERON:0001801 ! anterior segment of eyeball
30597+
relationship: part_of UBERON:0000019 ! camera-type eye
3060030598
relationship: present_in_taxon NCBITaxon:7955 {source="DOI:10.1177/0192623311409597"} ! Danio rerio
3060130599
property_value: depiction "http://upload.wikimedia.org/wikipedia/commons/e/eb/Gray869.png" xsd:anyURI
3060230600
property_value: editor_note "TODO - check child terms, isa vs partof. See also MA:0001284 ! tunica vasculosa plexus" xsd:string
@@ -90617,7 +90615,7 @@ property_value: external_definition "A pear shaped chamber that functions as a c
9061790615
[Term]
9061890616
id: UBERON:0004707
9061990617
name: pharyngula stage
90620-
def: "A stage that follows the blastula, gastrula and neurula stages. At the pharyngula stage, all vertebrate embryos show remarkable similarities." [Wikipedia:Pharyngula]
90618+
def: "A chordate developmental stage that follows the blastula, gastrula and neurula stages. At the pharyngula stage, all vertebrate embryos show remarkable similarities." [Wikipedia:Pharyngula]
9062190619
subset: efo_slim
9062290620
synonym: "pharyngula" RELATED []
9062390621
synonym: "phylotypic stage" EXACT []
@@ -90627,7 +90625,7 @@ xref: OGES:000006
9062790625
xref: Wikipedia:Pharyngula
9062890626
xref: ZFS:0000050
9062990627
is_a: UBERON:0000105 ! life cycle stage
90630-
relationship: in_taxon NCBITaxon:6072 ! Eumetazoa
90628+
relationship: in_taxon NCBITaxon:7711 ! Chordata
9063190629
relationship: part_of UBERON:0000111 ! organogenesis stage
9063290630
relationship: preceded_by UBERON:0000110 ! neurula stage
9063390631
property_value: taxon_notes "Corresponds to E7-E11 in Mouse (Galis et al, TREE, 2001)" xsd:string
@@ -119538,7 +119536,7 @@ is_a: UBERON:0000105 ! life cycle stage
119538119536
relationship: part_of UBERON:0000068 ! embryo stage
119539119537
relationship: preceded_by RnorDv:0000010 {gci_relation="part_of", gci_filler="NCBITaxon:10116"}
119540119538
relationship: preceded_by UBERON:0000111 ! organogenesis stage
119541-
relationship: preceded_by UBERON:0004707 ! pharyngula stage
119539+
relationship: preceded_by UBERON:0004707 {gci_relation="BFO:0000066", gci_filler="NCBITaxon:7711"} ! pharyngula stage
119542119540
property_value: seeAlso "https://github.com/obophenotype/uberon/issues/355" xsd:anyURI
119543119541
property_value: seeAlso "https://github.com/obophenotype/uberon/issues/565" xsd:anyURI
119544119542

@@ -154070,7 +154068,7 @@ synonym: "secondary brain vesicle" NARROW []
154070154068
xref: NCIT:C34259
154071154069
xref: neuronames:2499
154072154070
xref: SCTID:360409004
154073-
is_a: UBERON:0010064 {source="EHDAA2"} ! open anatomical space
154071+
is_a: UBERON:0010000 ! multicellular anatomical structure
154074154072
relationship: part_of UBERON:0000922 ! embryo
154075154073
relationship: part_of UBERON:0005281 {source="EHDAA2"} ! ventricular system of central nervous system
154076154074
relationship: part_of UBERON:0006238 ! future brain
@@ -201999,7 +201997,7 @@ def: "Fine ridge on surface of scale, often parallel to the circumference of sca
201999201997
synonym: "circuli" EXACT OMO:0003004 [TAO:0002051]
202000201998
synonym: "crétule" EXACT [PSPUB:0000149]
202001201999
xref: ZFA:0005499
202002-
is_a: UBERON:0006800 ! anatomical line
202000+
is_a: UBERON:0000061 ! anatomical structure
202003202001
relationship: part_of UBERON:0007380 ! dermal scale
202004202002
property_value: provenance_notes "This class was sourced from an external ontology (teleost_anatomy). Its definitions, naming conventions and relationships may need to be checked for compatibility with uberon" xsd:string {source="http://purl.obolibrary.org/obo/tao.owl"}
202005202003

src/ontology/uberon-idranges.owl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,3 +268,9 @@ Datatype: idrange:40
268268
allocatedto: "NDI Cloud"
269269
EquivalentTo:
270270
xsd:integer[>= 8910000, <= 8919999]
271+
272+
Datatype: idrange:41
273+
Annotations:
274+
allocatedto: "Arwa Ibrahim"
275+
EquivalentTo:
276+
xsd:integer[>= 8920000, <= 8929999]

src/ontology/uberon.Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@ $(OWLSRC): $(SRC) $(REPORTDIR)/$(SRC)-gocheck $(REPORTDIR)/$(SRC)-iconv
117117
-o $@
118118

119119
# Step 2: Reasoning.
120-
# For the temporary injection of property chains, see
121-
# <https://github.com/obophenotype/uberon/issues/2381>
122-
DEVELOPS_FROM_CHAIN=$(COMPONENTSDIR)/develops-from-chains.owl
123120
# The 'materialize' step is too resource-intensive for the GitHub
124121
# Action runners, so we leave it out when running online QC checks, see
125122
# <https://github.com/obophenotype/uberon/pull/3087#issuecomment-1755553647>
@@ -128,13 +125,11 @@ MATERIALIZE=
128125
else
129126
MATERIALIZE = materialize -T $(CONFIGDIR)/basic_properties.txt -r elk
130127
endif
131-
$(POSTPROCESS_SRC): $(OWLSRC) $(BRIDGEDIR)/uberon-bridge-to-bfo.owl $(DEVELOPS_FROM_CHAIN)
128+
$(POSTPROCESS_SRC): $(OWLSRC) $(BRIDGEDIR)/uberon-bridge-to-bfo.owl
132129
$(ROBOT) merge -i $(OWLSRC) -i $(BRIDGEDIR)/uberon-bridge-to-bfo.owl \
133-
-i $(DEVELOPS_FROM_CHAIN) \
134130
relax $(MATERIALIZE) \
135131
reason -r elk --exclude-duplicate-axioms true \
136132
--equivalent-classes-allowed asserted-only \
137-
unmerge -i $(DEVELOPS_FROM_CHAIN) \
138133
annotate -O $(URIBASE)/uberon.owl -V $(RELEASE)/uberon.owl -o $@
139134

140135
# Step 3: Postprocessing. We merge some files that are derived from the

0 commit comments

Comments
 (0)