Skip to content

Commit

Permalink
Merge pull request #1627 from OpenEnergyPlatform/releases-v1.16.0
Browse files Browse the repository at this point in the history
Release v1.16.0 to master
  • Loading branch information
nelekoehler authored Aug 1, 2023
2 parents 245163c + 9c1be22 commit 49b14f7
Show file tree
Hide file tree
Showing 68 changed files with 1,402 additions and 365 deletions.
88 changes: 75 additions & 13 deletions .github/workflows/automated-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,50 @@ jobs:
- name: make
run: |
make
- name: validate-profile
run: |
echo "java -jar build/robot.jar validate-profile --input build/oeo/$(cat VERSION)/oeo-full.owl --profile Full -vvv --output merged-validation.txt"
java -jar build/robot.jar validate-profile --input build/oeo/$(cat VERSION)/oeo-full.owl --profile Full -vvv --output merged-validation.txt
- name: verify
run: |
java -jar build/robot.jar verify --input build/oeo/$(cat VERSION)/oeo-full.owl --queries tests/verify/*
- uses: actions/upload-artifact@master
with:
name: build-artifacts
path: build/oeo
test:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '3.7'
architecture: x64
- uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
- uses: actions/download-artifact@master
with:
name: build-artifacts
path: build/oeo
- name: install python dependencies
run: pip install -r src/scripts/requirements.txt
- name: setup robot 1.9.0
run: |
wget https://github.com/ontodev/robot/releases/download/v1.9.0/robot.jar -O build/robot19.jar
- name: Build ETD xlsx
run: |
java -jar build/robot19.jar merge --input build/oeo/$(cat VERSION)/oeo-full.omn \
--include-annotations true \
export --header "ID|LABEL|definition" \
--prefix "OEO: http://openenergy-platform.org/ontology/oeo/OEO_" \
--sort "LABEL" \
--export $(pwd)/build/oeo/$(cat VERSION)/etd.xlsx
- name: Build ETD csv
run: |
python $(pwd)/src/scripts/etd/etd.py $(pwd)/build/oeo/$(cat VERSION)
- name: consistency
run: |
wget https://github.com/owlcs/releases/raw/master/HermiT/org.semanticweb.hermit-packaged-1.4.6.519-SNAPSHOT.jar -O build/hermit.jar
Expand All @@ -22,21 +66,39 @@ jobs:
fi
echo "Ontology is inconsistent: $OUT"
exit 1
- name: validate-profile
run: |
echo "java -jar build/robot.jar validate-profile --input build/oeo/$(cat VERSION)/oeo-full.owl --profile Full -vvv --output merged-validation.txt"
java -jar build/robot.jar validate-profile --input build/oeo/$(cat VERSION)/oeo-full.owl --profile Full -vvv --output merged-validation.txt
- name: verify
run: |
java -jar build/robot.jar verify --input build/oeo/$(cat VERSION)/oeo-full.owl --queries tests/verify/*
- name: competency
run: |
bash tests/competency_questions/run_questions.sh "java -jar build/hermit.jar" $(pwd)/build/oeo/$(cat VERSION)/oeo-full.owl true
bash tests/competency_questions/run_questions.sh "java -jar build/hermit.jar" $(pwd)/build/oeo/$(cat VERSION)/oeo-full.owl false
- name: Upload Artifacts
- name: Upload Ontology
if: always()
uses: actions/upload-artifact@v3
with:
name: build-files
path: |
build/**/*
!build/**/*.jar
!build/**/*.jar
- name: competency
continue-on-error: true
run: |
pytest -s -v
# bash tests/competency_questions/run_questions.sh "java -jar build/hermit.jar" $(pwd)/build/oeo/$(cat VERSION)/oeo-full.owl true
# bash tests/competency_questions/run_questions.sh "java -jar build/hermit.jar" $(pwd)/build/oeo/$(cat VERSION)/oeo-full.owl false
- name: Upload Artifacts
if: always()
uses: actions/upload-artifact@v3
with:
name: test-report
path: build/report.json
- name: Get Coverage for badge
run : |
echo "COVERAGE=$(head build/report.json | grep -o '"coverage": "[^"]*"' | grep -o '[^"]*\%')" >> $GITHUB_ENV
REF=${{ github.ref }}
IFS='/' read -ra PATHS <<< "$REF"
BRANCH_NAME="${PATHS[1]}_${PATHS[2]}"
echo "BRANCH=$(echo ${BRANCH_NAME})" >> $GITHUB_ENV
- name: Coverage Badge
uses: schneegans/[email protected]
with:
auth: ${{ secrets.GIST_SECRET }}
gistID: 6d00affa9fbc89c79684d62091d96551
filename: open_energy_ontology__${{ env.BRANCH }}.json
label: CQ Coverage
message: ${{ env.COVERAGE }}
color: green
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build/
*/__pycache__/*
39 changes: 34 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file.
The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.16.0] - 2023-08-01

### Added
- boolean value (#1255)
- material transformation, fuel production (#1575)
- life cycle assessment (#1576)
- energy technology (#1591)
- power generation technology and 20 subclasses (#1601)
- policy scenario, reference role, reference scenario (#1614)
- greenhouse gas emission scenario, co2 emission scenario (#1615)
- population count, annual GDP growth (#1623)

### Changed
- boolean variable, true, false (#1255)
- reimplemented competency question tests in pytest (#1420)
- added commands to filter competency questions from the command line (#1420)
- added descriptive names to competency questions. and organized them in directories (#1420)
- production (#1575)
- technology (#1591)
- quantity value (#1606)
- trade (#1613)
- climate scenario, climate system, energy scenario, carbon dioxide, energy system, supply system, emission scenario (#1615)
- secondary energy production (#1619)
- hydro energy, solar energy, wind energy (#1620)
- gross domestic product (#1623)

### Removed
- old compteency question bash script (#1420)

## [1.15.0] - 2023-05-31

### Added
Expand Down Expand Up @@ -284,7 +313,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/

### Removed

## [1.9.0] - 2022-03-01
## [1.9.0] - 2022-03-01

### Added
- memo item and CRF (2006) sector individuals relating to memo item; has information content entity (#966)
Expand Down Expand Up @@ -362,7 +391,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- power-to-gas process, power-to-methane process, methanation, oxygen, water electrolysis process (#954)
- biomass, biomethane (#952)
- variable (production) cost (#953)
- conventional (energy carrier disposition), fossil energy (#955)
- conventional (energy carrier disposition), fossil energy (#955)
- carbon tax, social cost of carbon, carbon price (#956)
- synthetic ammonia, power-to-ammonia process (#959)
- renewable waste fuel, fossil waste fuel, renewable industrial waste fuel, fossil industrial waste fuel (#961)
Expand Down Expand Up @@ -422,7 +451,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- objective variable (#878)
- metric ton (#879)
- target description (#881)
- scenario year, scenario horizon, meteorological year, weather time series, scenario time series (#882)
- scenario year, scenario horizon, meteorological year, weather time series, scenario time series (#882)
- axioms of typical period and aggregation type (#883)

### Changed
Expand Down Expand Up @@ -659,8 +688,8 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- Add has_normal_state_of_matter value solid/liquid/gaseous/plasmatic to fuels (#39)
- object properties: 'has_disposition', 'has_role', 'has_function',
'has_quality' (#51)
- issue templates (#92, #146)
- ArtificialObject (#121)
- issue templates (#92, #146)
- ArtificialObject (#121)
- classes for objects that apply to technologies like EnergyGenerator (#128)
- Grid class (#137)
- object properties to describe models (#109)
Expand Down
16 changes: 14 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,22 @@ authors:
given-names: "Ulf"
alias: "@u-mueller"
affiliation: "Fraunhofer IEE"
- family-names: "Köhler"
given-names: "Nele"
alias: "@nelekoehler"
affiliation: "Otto-von-Guericke-Universität"
- family-names: "Spinde"
given-names: "Hannah"
alias: "@h-spinde"
affiliation: "Otto-von-Guericke-Universität Magdeburg"
- family-names: "Wichern"
given-names: "Viktor"
alias: "@viktorwichern"
affiliation: "Otto-von-Guericke-Universität Magdeburg"
title: "Open Energy Ontology (OEO)"
type: software
license: CC0-1.0
version: 1.15.0
version: 1.16.0
doi:
date-released: 2023-05-31
date-released: 2023-08-01
url: "https://github.com/OpenEnergyPlatform/ontology"
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

[![License: CC0-1.0](https://img.shields.io/badge/License-CC0%201.0-lightgrey.svg)](http://creativecommons.org/publicdomain/zero/1.0/)
![GitHub release (latest by date)](https://img.shields.io/github/v/release/OpenEnergyPlatform/ontology)
![Coverage Badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/areleu/6d00affa9fbc89c79684d62091d96551/raw/open_energy_ontology__heads_feature-1419-competency-question-coverage-report.json)

# Open Energy Family - Open Energy Ontology (OEO)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.0
1.16.0
4 changes: 2 additions & 2 deletions src/ontology/edits/catalog-v001.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="../imports/ro-extracted.owl"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-module.owl" uri="../imports/uo-module.owl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
<uri id="Automatically generated entry, Timestamp=1676535243024" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
<uri id="Automatically generated entry, Timestamp=1676535243024" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
<uri id="Automatically generated entry, Timestamp=1685967799431" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
<uri id="Automatically generated entry, Timestamp=1685967799431" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
</group>
</catalog>
Loading

0 comments on commit 49b14f7

Please sign in to comment.