Skip to content

Commit 16364bc

Browse files
authored
Merge pull request #200 from OpenEnergyPlatform/release-v2.0.0
Release v2.0.0 Halloween Special 🎃🍭🍬🍾
2 parents d29f5d5 + 35f39b0 commit 16364bc

File tree

141 files changed

+9119
-1984
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+9119
-1984
lines changed

.github/ISSUE_TEMPLATE/issue_template_bug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ Describe possible ideas for solution and evaluate advantages and disadvantages.
2828
* Environment setup and (python) version:
2929

3030
## Workflow checklist
31-
- [ ] I am aware of the workflow in [CONTRIBUTING.md](https://github.com/rl-institut/super-repo/blob/develop/CONTRIBUTING.md)
31+
- [ ] I am aware of the workflow in [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oemetadata/blob/develop/CONTRIBUTING.md)
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Release Issue
3+
about: For a new release
4+
title: Release - Minor Version - 2.1.0
5+
labels: "enhancement"
6+
assignees: 'Ludee'
7+
8+
---
9+
10+
## Description of the release
11+
12+
Describe the release in as much detail as possible.
13+
14+
## Details of the release
15+
16+
**Name:** Find an appropriate and memorable name for the release that will help it be remembered.
17+
**Git tag:** v2.1.0 "OEMetadata Minor Release v2.1.0"
18+
**Release Manager:** Choose a responsible person.
19+
**Date:** Arrange a convenient date
20+
21+
## Workflow checklist
22+
- [ ] I am aware of the workflow in [RELEASE_PROCEDURE.md](https://github.com/OpenEnergyPlatform/oemetadata/blob/production/RELEASE_PROCEDURE.md)
23+
- [ ] 4. 🐙 Create a `Draft GitHub Release`
24+
- [ ] 5. 💠 Create a `release` branch
25+
- [ ] 6. 📝 Update the version files (CHANGELOG.md, CITATION.cff)
26+
- [ ] 7. 🐙 Create a Release Pull Request
27+
- [ ] 8. 💠 Set the `Git Tag`
28+
- [ ] 9. 🐙 Publish `GitHub Release`
29+
- [ ] 10. 💻 Update the documentation
30+
- [ ] 11. 🐙 Set up new development
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: User Kudos Issue
3+
about: User Community - Give kudos to the project
4+
title: Add new user to USERS.cff
5+
labels: user
6+
assignees: ''
7+
8+
---
9+
10+
I thank the developers of the project. <br>
11+
Please add my information to the file [USERS.cff](https://github.com/OpenEnergyPlatform/oemetadata/blob/production/USERS.cff).
12+
13+
family-names:
14+
given-names:
15+
alias:
16+
affiliation:
17+
orcid:

.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Closes #
2323
- [ ] 🐙 Follow the workflow in [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oemetadata/blob/develop/CONTRIBUTING.md)
2424
- [ ] 📝 Update the [CHANGELOG.md](https://github.com/OpenEnergyPlatform/oemetadata/blob/develop/CHANGELOG.md)
2525
- [ ] 📙 Update the documentation
26+
- [ ] 🐙 Assign a reviewer to the PR
2627

2728
### Reviewer
2829
- [ ] 🐙 Follow the [Reviewer Guidelines](https://github.com/OpenEnergyPlatform/oemetadata/blob/develop/CONTRIBUTING.md#40-let-someone-else-review-your-pr)

.github/workflows/gh-pages.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: gh-pages
2+
on:
3+
push:
4+
branches:
5+
- production
6+
permissions:
7+
contents: write
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-python@v4
14+
with:
15+
python-version: 3.x
16+
- uses: actions/cache@v2
17+
with:
18+
key: ${{ github.ref }}
19+
path: .cache
20+
- run: pip install --upgrade -r requirements.txt
21+
- run: mkdocs gh-deploy --force

.github/workflows/metadata-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name: Automated tests
99

1010
on:
1111
push:
12-
branches: [ develop, master]
12+
branches: [ develop, production]
1313
pull_request:
14-
branches: [ develop, master ]
14+
branches: [ develop, production ]
1515

1616
jobs:
1717
test:

.github/workflows/pypi-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
environment: pypi-publish
1212
steps:
13-
- uses: actions/checkout@master
13+
- uses: actions/checkout@production
1414
- name: Set up Python 3.10
1515
uses: actions/setup-python@v3
1616
with:

.github/workflows/test-pypi-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
environment: pypi-publish
1414
steps:
15-
- uses: actions/checkout@master
15+
- uses: actions/checkout@production
1616
- name: Set up Python 3.10
1717
uses: actions/setup-python@v3
1818
with:

CHANGELOG.md

Lines changed: 61 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,83 @@
11
# Changelog
22

3-
All notable changes to this project will be documented in this file.
3+
All notable changes to this project will be documented in this file. <br>
4+
For each version, important additions, changes and removals are listed here.
45

5-
The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
6-
and the versioning aim to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
6+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
7+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
78

8-
Here is a template for new release sections
99

10-
```
11-
## Current
12-
13-
### Added
14-
-
15-
### Changed
16-
-
17-
### Removed
18-
-
19-
20-
## [0.0.0] - Release - Name of Release - 20YY-MM-DD
21-
22-
### Added
23-
-
24-
### Changed
25-
-
26-
### Removed
27-
-
28-
```
29-
30-
## Current
10+
## [2.0.0] - Major Release - Refactor OEMetadata for NFDI
3111

3212
### Added
13+
- Add OEMetadata version 2.0: [#144](https://github.com/OpenEnergyPlatform/oemetadata/issues/144)
14+
- Introduce a schema build system: [#105](https://github.com/OpenEnergyPlatform/oemetadata/pull/105)
15+
- The build files (schema & script) are maintained for each version (starting form v1.6.0) within the new directory called "metadata/(version)/build_source"
16+
- The schema is rather long and complex. We split the long schema.json into modules. The modules are assembled in a json file that specifies the structure of the final schema.json, and it is called schema_structure.json.
17+
- It uses JSON schema $ref elements to reference the schema modules, and it provides code to resolve the reference´s and generate the complete schema.json.
18+
- Add code to generate an example.json based on the schema.json. We read the example values for each of the fields specified in the schema and generate the example. [#105](https://github.com/OpenEnergyPlatform/oemetadata/pull/105)
19+
- Add updated context.json [(#154)](https://github.com/OpenEnergyPlatform/oemetadata/pull/154)
20+
- Add ``embargoPeriod`` section with keys ``start``, ``end``, ``isActive`` [(#155)](https://github.com/OpenEnergyPlatform/oemetadata/pull/155)
21+
- Add ``path`` to ``contributors`` [(#157)](https://github.com/OpenEnergyPlatform/oemetadata/pull/157)
22+
- Add organization to contributors [(#157)](https://github.com/OpenEnergyPlatform/oemetadata/pull/157)
23+
- Add roles to contributors [(#157)](https://github.com/OpenEnergyPlatform/oemetadata/pull/157)
24+
- Add section for ``Linked Data`` keys [(#159)](https://github.com/OpenEnergyPlatform/oemetadata/pull/159)
25+
- Add mandatory fields to the json schema (Iron Badge) [(#160)](https://github.com/OpenEnergyPlatform/oemetadata/pull/160)
26+
- Add key ``copyrightStatement`` to ``sources`` [(#162)](https://github.com/OpenEnergyPlatform/oemetadata/pull/162)
27+
- Add key nullable to fields section (columns) [(#161)](https://github.com/OpenEnergyPlatform/oemetadata/pull/161)
28+
- Add explicit json types [(#166)](https://github.com/OpenEnergyPlatform/oemetadata/pull/166)
29+
- Add key ``topics`` to ``general`` [(#170)](https://github.com/OpenEnergyPlatform/oemetadata/pull/170)
30+
- Add badge labels to documentation [(#175)](https://github.com/OpenEnergyPlatform/oemetadata/pull/175)
31+
- Implement schema build system v1: Enhance the resolve and generation module [(#180)](https://github.com/OpenEnergyPlatform/oemetadata/pull/180)
32+
- Add basic documentation with MkDocs [(#184)](https://github.com/OpenEnergyPlatform/oemetadata/pull/184)
33+
- Add key ``publisher`` to ``context`` [(#191)](https://github.com/OpenEnergyPlatform/oemetadata/pull/191)
34+
- Add array ``authors`` to ``sources``. [(#193)](https://github.com/OpenEnergyPlatform/oemetadata/pull/193)
35+
- Add ``year`` to ``sources`` [(#194)](https://github.com/OpenEnergyPlatform/oemetadata/pull/194)
36+
- Add key ``description`` to ``collection`` and update badges [(#195)](https://github.com/OpenEnergyPlatform/oemetadata/pull/195)
37+
- Add mappings to DCAT-AP to the documentation [(#198)](https://github.com/OpenEnergyPlatform/oemetadata/pull/198)
38+
- Add issue template for user kudos [(#199)](https://github.com/OpenEnergyPlatform/oemetadata/pull/199)
3339

3440
### Changed
41+
- Remove comment field as it holds information on how to fill out the metadata and therefore should not be part of the actual oemetadata but the documentation. [#105](https://github.com/OpenEnergyPlatform/oemetadata/pull/105)
42+
- Update the schema json file content (schema generation still broken, add desired output) and fix the schema path in the script for generating examples (it pointed to an incorrect directory and file name) [(#149)](https://github.com/OpenEnergyPlatform/oemetadata/pull/149)
43+
- Update broken Link in key description example [(#159)](https://github.com/OpenEnergyPlatform/oemetadata/pull/159)
44+
- Update ``resource/profile`` to ``resource/type`` [(#164)](https://github.com/OpenEnergyPlatform/oemetadata/pull/164)
45+
- Update links in context.json and example.json for all versions [(#167)](https://github.com/OpenEnergyPlatform/oemetadata/pull/167)
46+
- Restrict the version number to only major and minor versions since 2.0 [(#168)](https://github.com/OpenEnergyPlatform/oemetadata/pull/168)
47+
- Update all descriptions and examples [(#175)](https://github.com/OpenEnergyPlatform/oemetadata/pull/175)
48+
- Build scripts use a settings file to share variables [(#177)](https://github.com/OpenEnergyPlatform/oemetadata/pull/177)
49+
- Refactor the ``spatial`` section and add new keys for location: ``address``, ``@id``, ``latitude``, ``longitude`` and for extent: ``name``, ``@id``, ``resolutionValue``, ``resolutionUnit``, ``boundingBox``, ``crs`` [(#179)](https://github.com/OpenEnergyPlatform/oemetadata/pull/179)
50+
- Move ``linkedData`` keys to the top of the resource [(#183)](https://github.com/OpenEnergyPlatform/oemetadata/pull/183)
51+
- Update order of keys in section context [(#191)](https://github.com/OpenEnergyPlatform/oemetadata/pull/191)
3552

3653
### Removed
37-
-
54+
- Remove email from contributors [(#157)](https://github.com/OpenEnergyPlatform/oemetadata/pull/157)
55+
- Remove all additionalProperties is false [(#163)](https://github.com/OpenEnergyPlatform/oemetadata/pull/163)
56+
- Remove duplicate keys from resources [(#165)](https://github.com/OpenEnergyPlatform/oemetadata/pull/165)
57+
- Remove linkedData section and keys [(#176)](https://github.com/OpenEnergyPlatform/oemetadata/pull/176)
58+
3859

3960
## [1.6.0] - Release - Introduce badges in json schema - 2023-05-30
4061

4162
### Added
42-
43-
- Add badge for all fields [PR#117]
63+
- Add badge for all fields [PR#117](https://github.com/OpenEnergyPlatform/oemetadata/pull/117)
4464
- Add CITATION.cff with list of authors [(#111)](https://github.com/OpenEnergyPlatform/oemetadata/pull/111)
4565

4666
### Changed
47-
- Separate examples from descripton and put into its own key-value pair [PR#117]
67+
- Separate examples from description and put into its own key-value pair [(PR#117)](https://github.com/OpenEnergyPlatform/oemetadata/pull/117)
4868
- Add issue and PR templates [(#116)](https://github.com/OpenEnergyPlatform/oemetadata/pull/116)
49-
- Update context field [PR#114]
69+
- Update context field [(PR#114)](https://github.com/OpenEnergyPlatform/oemetadata/pull/114)
5070

51-
### Removed
52-
-
5371

54-
## [1.5.2] - Release - Fix missing json files in pypi package, Improve context.jsonld - 2022-11-18
55-
56-
- Fix missing json files in pypi oemetadata package
57-
- Add github actions/workflwos to automate package build and upload process on test and production pypi index
72+
## [1.5.2] - Release - Fix Repo and Package - 2022-11-18
5873

5974
### Added
75+
- Add GitHub actions to automate package build and upload process on test and production pypi index
6076

6177
### Changed
62-
- Update context.json in latest & v151 to ensure ontologically annotated metadata can be sparqled #99
78+
- Fix missing json files in pypi oemetadata package
79+
- Update context.json in latest & v151 to ensure ontologically annotated metadata can be sparkled #99
80+
6381

6482
## [1.5.1] - Release - Ontology-Ready - 2022-02-21
6583

@@ -79,6 +97,7 @@ Here is a template for new release sections
7997
- Update CHANGELOG.md and give names to releases
8098
- Update CONTRIBUTING.md
8199

100+
82101
## [1.5.0] - Release - Get Some Semantics - 2021-11-18
83102

84103
### Added
@@ -91,12 +110,13 @@ Here is a template for new release sections
91110
- Make key 13.2 ``timeseries`` a list
92111
- Relocate development information from README.md to CONTRIBUTING.md
93112
- Update all .json files to v1.5.0
94-
- Reintroduce automated tests (CI) by switching form travis-ci to github actions [PR#63]
95-
- Updated schema.json for v1.5.0 now includes the new key ``title`` which describes the title of the curent field [PR#56] adapted from [PR#43]
113+
- Reintroduce automated tests (CI) by switching form travis-ci to GitHub actions [PR#63]
114+
- Updated schema.json for v1.5.0 now includes the new key ``title`` which describes the title of the current field [PR#56] adapted from [PR#43]
96115

97116
### Removed
98117
- Delete future directory
99118

119+
100120
## [1.4.1] Minor Release - Repo Upgrade - 2021-01-18
101121

102122
### Added
@@ -108,6 +128,7 @@ Here is a template for new release sections
108128
### Changed
109129
- Rename repository from "metadata" to "oemetadata"
110130

131+
111132
## [1.4.0] Release - It'll be a standard - 2021-01-11
112133

113134
### Added
@@ -128,6 +149,7 @@ Here is a template for new release sections
128149
### Changed
129150
- Rename ``url`` to ``path`` according to datapackage standard
130151

152+
131153
## [1.0.1] Initial Release - Hello OEMetadata - 2019-11-07
132154

133155
### Added

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ authors:
2828
title: "Open Energy Family - Open Energy Metadata (OEMetadata)"
2929
type: software
3030
license: MIT
31-
version: 1.5.2
31+
version: 2.0.0
3232
doi:
33-
date-released: 2022-11-18
33+
date-released: 2024-10-31
3434
url: "https://github.com/OpenEnergyPlatform/oemetadata"

0 commit comments

Comments
 (0)