Skip to content
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

Jump to bottom

Merge release 2.1.0 to dev #1780

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Merge release 2.1.0 to dev #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
926cab6
Updated versions and dates for release 2.1.0
areleu Dec 5, 2023
ab624cd
Reordered changelog
areleu Dec 5, 2023
a6a1a8e
Further changelog reordering
areleu Dec 5, 2023
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
14 changes: 5 additions & 9 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.
and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).


## [2.X.X] - 20XX-XX-XX
## [2.1.0] - 2023-12-05

### Added
- resilience, power system resilience, power system (#1744)
- import from IAO: time stamped measurement datum, action specification, data format specification, objective specification, study design, software application, software library, software method, software module, software script, document part, journal article, version number, cartesian spatial coordinate datum, one dimensional cartesian spatial coordinate datum, two dimensional cartesian spatial coordinate datum, three dimensional cartesian spatial coordinate datum, has time stamp (#1754)
- service product role, service product (#1748)
- region of relevance, study subregion role, study region role, interacting region role, considered region role (#1749)
- import from IAO: time stamped measurement datum, action specification, data format specification, objective specification, study design, software application, software library, software method, software module, software script, document part, journal article, version number, cartesian spatial coordinate datum, one dimensional cartesian spatial coordinate datum, two dimensional cartesian spatial coordinate datum, three dimensional cartesian spatial coordinate datum, has time stamp (#1754)
- fuel blending quota, fuel quota blending value (#1763)
- study report due to legal obligation (#1777)
- market share and market share value (#1779)
Expand All @@ -20,18 +20,14 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- subregion, study region, study subregion, interacting region, considered region (#1749)
- model factsheet (#1751)
- is connected to, has sink, has source (#1762)
- power rating, power capacity (#1770)
- carbon capture and storage technology (#1768)
- boiler (#1771)
- temperature, pressure (#1767)
- data descriptor (#1775)
- carbon capture and storage technology (#1768)
- power rating, power capacity (#1770)
- boiler (#1771)
- B7, E10 (#1774)
- data descriptor (#1775)
- target description, policy instrument, policy (#1778)

### Removed


## [2.0.1] - 2023-10-26

### Changed
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ authors:
title: "Open Energy Ontology (OEO)"
type: software
license: CC0-1.0
version: 2.0.1
version: 2.1.0
doi:
date-released: 2023-10-26
date-released: 2023-12-05
url: "https://github.com/OpenEnergyPlatform/ontology"
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.1
2.1.0
Loading