Merge pull request #1988 from OpenEnergyPlatform/releases-v2.6.0

Release v2.6.0 to `master` branch

.github/pull_request_template.md

@@ -21,7 +21,7 @@ Closes #
 ### PR-Assignee
 - [ ] 🐙 Follow the [Pull Request Workflow](https://github.com/OpenEnergyPlatform/ontology/wiki/Pull-request-workflow)
 - [ ] 📝 Update the [CHANGELOG.md](https://github.com/OpenEnergyPlatform/ontology/blob/dev/CHANGELOG.md)
-- [ ] 📙 Add #'s to `term tracker item`
+- [ ] 📙 Add #'s to `term tracker annotation`
 
 ### Reviewer
 - [ ] 🐙 Follow the [Reviewer Guide](https://github.com/OpenEnergyPlatform/ontology/wiki/Pull-request-workflow#reviewer-guide-check-changes-introduced-by-a-pull-request)

.github/workflows/IssueProject.yml

@@ -1,20 +1,24 @@
 name: Add new GitHub issues and pull requests to the "Issues" project
-on: [issues, pull_request]
+on:
+  issues:
+    types:
+      - opened
+  pull_request:
+    types:
+      - opened
 jobs:
   github-actions-automate-projects:
     runs-on: ubuntu-latest
     steps:
     - name: add-new-issues-to-repository-based-project-column
-      uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-      if: github.event_name == 'issues' && github.event.action == 'opened'
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_PROJECT_URL: https://github.com/orgs/OpenEnergyPlatform/projects/45
-        GITHUB_PROJECT_COLUMN_NAME: To do
+      uses: actions/add-to-project@v1.0.2
+      with:
+        project-url: https://github.com/orgs/OpenEnergyPlatform/projects/45
+        github-token: ${{ secrets.OEO_WORKFLOWS }}
+      if: github.event_name == 'issues'
     - name: add-new-prs-to-repository-based-project-column
-      uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-      if: github.event_name == 'pull_request' && github.event.action == 'opened'
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_PROJECT_URL: https://github.com/orgs/OpenEnergyPlatform/projects/45
-        GITHUB_PROJECT_COLUMN_NAME: Review in progress
+      uses: actions/add-to-project@v1.0.2
+      with:
+        project-url: https://github.com/orgs/OpenEnergyPlatform/projects/45
+        github-token: ${{ secrets.OEO_WORKFLOWS }}
+      if: github.event_name == 'pull_request'

.github/workflows/LabelInDiscussion.yml

@@ -0,0 +1,30 @@
+name: Label issues as "In discussion"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  labelIssueAsInDiscussion:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+    - name: count
+      id: count
+      uses: akleinau/githubJSActions/DiscussedToColumn@master
+      with:
+        repo: https://api.github.com/repos/OpenEnergyPlatform/ontology
+    - run: gh issue edit "$NUMBER" --remove-label "$LABELS"
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_REPO: ${{ github.repository }}
+        NUMBER: ${{ github.event.issue.number }}
+        LABELS: To do
+      if: steps.count.outputs.continue == 'true' 
+    - run: gh issue edit "$NUMBER" --add-label "$LABELS"
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_REPO: ${{ github.repository }}
+        NUMBER: ${{ github.event.issue.number }}
+        LABELS: in discussion
+      if: steps.count.outputs.continue == 'true' 

.github/workflows/MoveInDiscussionProject.yml

@@ -0,0 +1,21 @@
+name: Move issues to "In discussion" project column
+on:
+  issues: 
+    types: [labeled]
+
+jobs:
+  moveIssueToInDiscussionColumn:
+    if: github.event_name == 'issues' && github.event.issue.state == 'open'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: PaperMC/update-projects-action@v0.2.0
+        with:
+          github-token: "${{ secrets.OEO_WORKFLOWS }}"
+          project-url: https://github.com/orgs/OpenEnergyPlatform/projects/45/views/1
+          column-field: Status
+          clear-on-no-match: false
+          label-to-column-map: |
+            {
+              "To do": "To do",
+              "in discussion": "In discussion"
+            }

.github/workflows/PostReleaseScripts.yml

@@ -6,21 +6,19 @@ name: Post Release Scripts
 #       - 'feature-1020-export-of-existing-terms-and-definitions'
 # First we test the setup, to see if the files are building correctly once that is checked we introduce the wiki upload each release.
 on:
- push:
-   tags:
-     - "v*"
-   branches:
-     - 'feature-1020-export-of-existing-terms-and-definitions'
+  release: 
+    types: [published]
+
 jobs:
   exportTermsDefinitions:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: '3.7'
           architecture: x64
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '11'
@@ -45,7 +43,7 @@ jobs:
         run: |
           python src/scripts/etd/etd.py
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: existing-terms-and-definitions
           path: src/scripts/etd/glossary
@@ -62,3 +60,73 @@ jobs:
       #     git config --local user.name "GitHub Action"
       #     git add .
       #     git diff-index --quiet HEAD || git commit -m "Add changes" && git push
+
+  buildOntologyFullAndClosure:
+    # steps taken from the build job in automated-testing.yml
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - name: make
+        run: |
+          make
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7.17'
+          architecture: x64
+      - 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: Upload Ontology
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-files
+          path: |
+            build/**/*
+            !build/**/*.jar
+
+  attachArtifactsToRelease:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: build-files
+          path: build/oeo
+      - name: Zip build files again for usage as release artifact
+        run: |
+          cd build
+          zip -r ../build-files.zip oeo
+          cd ..
+      - uses: actions/download-artifact@v4
+        with:
+          name: existing-terms-and-definitions
+          path: src/scripts/etd/glossary
+      - name: Zip terms and definitions for usage as release artifact
+        run: |
+          cd src/scripts/etd/glossary
+          zip -r ../../../../existing-terms-and-definitions.zip ./
+          cd ../../../..
+      - name: Attach artifacts to release
+        uses: ncipollo/release-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.event.release.tag_name }}
+          allowUpdates: true
+          artifacts: "${{ github.workspace }}/build-files.zip,${{ github.workspace }}/existing-terms-and-definitions.zip"

.github/workflows/automated-testing.yml

@@ -4,39 +4,39 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '11'
       - name: make
         run: |
-          make
+          make base merge
       - 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
+      - uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: build/oeo
   test:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.7.17'
           architecture: x64
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '11'
-      - uses: actions/download-artifact@master
+      - uses: actions/download-artifact@v4
         with:
           name: build-artifacts
           path: build/oeo
@@ -68,7 +68,7 @@ jobs:
           exit 1
       - name: Upload Ontology
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-files
           path: |
@@ -82,7 +82,7 @@ jobs:
           # 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
+        uses: actions/upload-artifact@v4
         with:
           name: test-report
           path: build/report.json
@@ -94,11 +94,11 @@ jobs:
           BRANCH_NAME="${PATHS[1]}_${PATHS[2]}"
           echo "BRANCH=$(echo ${BRANCH_NAME})" >> $GITHUB_ENV
       - name: Coverage Badge
-        uses: schneegans/dynamic-badges-action@v1.0.0
+        uses: schneegans/dynamic-badges-action@v1.7.0
         with:
           auth: ${{ secrets.GIST_SECRET }}
           gistID: 6d00affa9fbc89c79684d62091d96551
           filename: open_energy_ontology__${{ env.BRANCH }}.json
           label: CQ Coverage
           message: ${{ env.COVERAGE }}
-          color: green
+          color: green

CHANGELOG.md

@@ -4,6 +4,33 @@ 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).
 
+## [2.6.0] - 2024-12-06
+### Added
+- has aggregation type, has time stamp alignment (#1944)
+- study descriptor (#1950)
+- file oeo-tasks (#1940)
+- action specification for techno-economic potential, calculate economic potential, calculate levelised cost of energy, determine capital expenditures, determine discount and interest rate, determine operational expenditures, determine wind turbine lifetime (#1940, #1964)
+- action specification for the feasible potential, apply constraints for assessment of potential, calculate feasible potential (#1940)
+- action specification for the technical wind potential, account for wake losses, calculate technical potential, determine annual energy yield, determine capacity density, determine capacity factor, place turbines within area, select appropriate turbine types (#1940, #1966)
+- action specification for wind characteristics, air density adjustment, data preparation, wind power density calculation, wind speed calculation, wind speed frequency analysis, wind variability identification (#1940, #1964, #1966)
+- action specification for wind farm development area, determine development area, determine geographical potential, improve spatial resolution, prepare exclusion criteria datasets, run multi-criteria decision analysis, select exclusion criteria (#1940, #1964)
+- determined feasible potential, determined techno-economic potential, determined wind characteristics, determined wind farm area, determined wind potential (#1940)
+- uncertainty of a model, nature of uncertainty, level of uncertainty, location of uncertainty role, ambiguous uncertainty, epistemological uncertainty, ontological uncertainty, shallow uncertainty, medium uncertainty, deep uncertainty, recognised ignorance, has uncertainty nature, has uncertainty location, has uncertainty level (#1829)
+- feasible potential determination process, techno-economic potential determination process, wind characteristics determination process, wind farm area determination process, wind potential determination process (#1940, #1966)
+- feasible potential determination method, techno-economic potential determination method, wind characteristics determination method, wind farm area determination method, wind potential determination method (#1940, #1966)
+- model system boundary (#1977)
+- technical model implementation(#1978)
+- gaseous (#1980)
+
+### Changed
+- energy amount value / energy value (#1941)
+- rework contributing and readme file (#1937, #1946)
+- time stamp (#1944)
+- supply grid, transport network, critical infrastructure (#1947)
+- areal solar energy density (#1983)
+
+
+
 ## [2.5.0] - 2024-09-24
 ### Added
 - German alternative labels (#1883, #1895)

CITATION.cff

@@ -166,6 +166,6 @@ authors:
 title: "Open Energy Ontology (OEO)"
 type: software
 license: CC0-1.0
-version: 2.5.0
-date-released: 2024-09-24
+version: 2.6.0
+date-released: 2024-12-06
 url: "https://github.com/OpenEnergyPlatform/ontology"