Skip to content

Add oeo-tools as submodule and build imports in the CI #1888

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.

Sign up for GitHub

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

Draft
areleu wants to merge 9 commits into
base: dev
Choose a base branch
from
Draft

Add oeo-tools as submodule and build imports in the CI #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a1d2e63
Added oeo-tools as submodule
areleu Jul 10, 2024
0982fa5
Added imports to makefile
areleu Jul 10, 2024
c7c265a
Removed uo from makefile
areleu Jul 10, 2024
8cbc496
Implement changes of oeo-tools
areleu Jul 11, 2024
ddd1048
Updated robot version
areleu Jul 11, 2024
9aa5fb5
Merge branch 'dev' into sync-oeo-tools
enioarz Feb 13, 2025
e892a25
Merge branch 'dev' into sync-oeo-tools
areleu Mar 6, 2025
445c11d
Merge branch 'dev' into sync-oeo-tools
areleu Oct 1, 2025
2e2a284
Updated oeo-tools
areleu Oct 1, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
build/
*/__pycache__/*
*.properties
tmp
.idea
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "oeo-tools"]
path = oeo-tools
url = git@github.com:OpenEnergyPlatform/oeo-tools.git
18 changes: 16 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MKDIR_P = mkdir -p
VERSION:= $(shell cat VERSION)
VERSIONDIR := build/oeo/$(VERSION)
ONTOLOGY_SOURCE := src/ontology

IMPORTS := $(ONTOLOGY_SOURCE)/imports
subst_paths = ${subst $(ONTOLOGY_SOURCE),$(VERSIONDIR),${patsubst $(ONTOLOGY_SOURCE)/edits/%,$(ONTOLOGY_SOURCE)/modules/%,$(1)}}

OWL_FILES := $(call subst_paths,$(shell find $(ONTOLOGY_SOURCE)/* -type f -name "*.owl"))
Expand Down Expand Up @@ -52,6 +52,8 @@ endef

all: base merge closure

imports: directories $(IMPORTS)/ro-extracted.owl $(IMPORTS)/iao-extracted.owl $(IMPORTS)/uo-extracted.owl

base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OWL_COPY) $(OMN_COPY) $(OMN_TRANSLATE)

merge: | $(VERSIONDIR)/oeo-full.omn
Expand All @@ -61,8 +63,20 @@ closure: | $(VERSIONDIR)/oeo-closure.owl
clean:
- $(RM) -r $(VERSIONDIR) $(ROBOT_PATH)

clean-imports:
- $(RM) -r $(IMPORTS)/*.owl

directories: ${VERSIONDIR}/imports ${VERSIONDIR}/modules

$(IMPORTS)/iao-extracted.owl: $(ROBOT_PATH)
bash oeo-tools/oeo-imports/iao/extract-iao-module.sh

$(IMPORTS)/ro-extracted.owl: $(ROBOT_PATH)
bash oeo-tools/oeo-imports/ro/extract-from-relations-ontology.sh

$(IMPORTS)/uo-extracted.owl: $(ROBOT_PATH)
bash oeo-tools/oeo-imports/uo/extract-uo-module.sh

${VERSIONDIR}/imports:
${MKDIR_P} ${VERSIONDIR}/imports

Expand All @@ -75,7 +89,7 @@ $(VERSIONDIR)/catalog-v001.xml: src/ontology/catalog-v001.xml
sed -i -E "s/edits\//modules\//m" $@

build/robot.jar: | build
curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.9.2/robot.jar
curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.9.6/robot.jar


$(VERSIONDIR)/%.owl: $(VERSIONDIR)/%.omn
Expand Down
1 change: 1 addition & 0 deletions oeo-tools
Open in desktop
Submodule oeo-tools added at 6fe857
2 changes: 1 addition & 1 deletion src/ontology/imports/iao-extracted.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3727,5 +3727,5 @@ Request that IAO either clarify these or change definitions not to use them</owl



<!-- Generated by the OWL API (version 4.5.25) https://github.com/owlcs/owlapi -->
<!-- Generated by the OWL API (version 4.5.26) https://github.com/owlcs/owlapi -->

105 changes: 45 additions & 60 deletions src/ontology/imports/uo-extracted.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- http://purl.obolibrary.org/obo/IAO_0000115 -->

<owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000115">
<rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
<rdfs:label>definition</rdfs:label>
</owl:AnnotationProperty>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
Expand Down Expand Up @@ -148,6 +148,18 @@
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
<owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
<owl:annotatedTarget>&quot;A unit of measurement is a standardized quantity of a physical quality.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
Expand All @@ -167,26 +179,26 @@
</owl:Class>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
<owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
<owl:annotatedTarget>&quot;A unit which is a standard measure of the distance between two points.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
<owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
<owl:annotatedTarget>length unit</owl:annotatedTarget>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
<owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
<owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
<owl:annotatedTarget>&quot;A unit which is a standard measure of the distance between two points.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
<owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
<owl:annotatedTarget>length unit</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>

Expand Down Expand Up @@ -909,26 +921,26 @@
</owl:Class>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000033"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
<owl:annotatedTarget>day</owl:annotatedTarget>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
<owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_1000033"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000033"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
<owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
<owl:annotatedTarget>&quot;A time unit which is equal to 24 hours.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000033"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
<owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_1000033"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
<owl:annotatedTarget>day</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000033"/>
<owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
<owl:annotatedTarget>&quot;A time unit which is equal to 24 hours.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
<owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>

Expand Down Expand Up @@ -1077,6 +1089,7 @@
<!-- http://purl.obolibrary.org/obo/UO_0000046 -->

<owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000046">
<rdfs:subClassOf rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
<rdfs:label>prefix</rdfs:label>
</owl:Class>
Expand All @@ -1086,6 +1099,12 @@
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000046"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000046"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
Expand Down Expand Up @@ -2852,48 +2871,6 @@



<!-- http://purl.obolibrary.org/obo/UO_0000189 -->

<owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000189">
<rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/UO_0000186"/>
<obo:IAO_0000115>&quot;A dimensionless unit which denotes a simple count of things.&quot; [MGED:MGED]</obo:IAO_0000115>
<oboInOwl:hasExactSynonym>count</oboInOwl:hasExactSynonym>
<rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
<rdfs:label>count unit</rdfs:label>
</owl:Class>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000189"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
<owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000189"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
<owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000186"/>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000189"/>
<owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
<owl:annotatedTarget>&quot;A dimensionless unit which denotes a simple count of things.&quot; [MGED:MGED]</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000189"/>
<owl:annotatedProperty rdf:resource="http://www.geneontology.org/formats/oboInOwl#hasExactSynonym"/>
<owl:annotatedTarget>count</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>
<owl:Axiom>
<owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000189"/>
<owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
<owl:annotatedTarget>count unit</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>



<!-- http://purl.obolibrary.org/obo/UO_0000190 -->

<owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000190">
Expand Down Expand Up @@ -6055,9 +6032,17 @@
<owl:annotatedTarget>gram per square meter based unit</owl:annotatedTarget>
<prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
</owl:Axiom>



<!-- http://www.w3.org/2002/07/owl#Thing -->

<rdf:Description rdf:about="http://www.w3.org/2002/07/owl#Thing">
<rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
</rdf:Description>
</rdf:RDF>



<!-- Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi -->
<!-- Generated by the OWL API (version 4.5.26) https://github.com/owlcs/owlapi -->

Loading