Skip to content

Commit 0e713f7

Browse files
authored
Merge branch 'develop' into feature/1931-update-the-opr-to-use-oemtadata-v2-specification
2 parents 11fd759 + e4f30c5 commit 0e713f7

File tree

22 files changed

+1293
-512
lines changed

22 files changed

+1293
-512
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.3.0
2+
current_version = 1.3.2
33

44
[bumpversion:file:VERSION]
55

.github/workflows/reuse.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# SPDX-FileCopyrightText: 2025 Ludwig Hülk <https://github.com/Ludee> © Reiner Lemoine Institut
2+
# SPDX-FileCopyrightText: oeplatform <https://github.com/OpenEnergyPlatform/oeplatform>
3+
# SPDX-License-Identifier: AGPL-3.0-or-later
4+
5+
name: 📝 REUSE Compliance Check
6+
7+
on: [push, pull_request]
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: REUSE compliance check
15+
uses: fsfe/reuse-action@v4

CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cff-version: 1.3.0
1+
cff-version: 1.3.2
22
message: "If you use this software, please cite it using these metadata."
33
authors:
44
- family-names: "Hülk"
@@ -28,7 +28,7 @@ authors:
2828
title: "Open Energy Family - Open Energy Platform (OEP)"
2929
type: software
3030
license: AGPL-3.0-or-later
31-
version: 1.3.0
31+
version: 1.3.2
3232
doi:
33-
date-released: 2025-06-11
33+
date-released: 2025-07-10
3434
url: "https://github.com/OpenEnergyPlatform/oeplatform/"

README.md

Lines changed: 0 additions & 52 deletions
This file was deleted.

README.rst

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
..
2+
SPDX-FileCopyrightText: oeplatform <https://github.com/OpenEnergyPlatform/oeplatform>
3+
SPDX-License-Identifier: CC0-1.0
4+
5+
.. figure:: https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/docs/img/banner_oefamily_oep.png
6+
:align: left
7+
:target: https://github.com/OpenEnergyPlatform/oeplatform/
8+
:alt: OEP Logo
9+
10+
==========================
11+
Open Energy Platform (OEP)
12+
==========================
13+
14+
**The Open Energy Platform (OEP) is research data infrastructure for the energy, climate and mobility domain.**
15+
16+
.. list-table::
17+
:widths: auto
18+
19+
* - License
20+
- |badge_license| |badge_reuse|
21+
* - Documentation
22+
- |badge_documentation| |badge_mkdocs|
23+
* - Tests
24+
- |badge_tox|
25+
* - Publication
26+
-
27+
* - Development
28+
- |badge_issue_open| |badge_issue_closes| |badge_pr_open| |badge_pr_closes|
29+
* - Community
30+
- |badge_contributions| |badge_contributors| |badge_repo_counts|
31+
32+
.. contents::
33+
:depth: 2
34+
:local:
35+
:backlinks: top
36+
37+
Introduction
38+
============
39+
| The Open Energy Family promotes quality, transparency, and reproducibility in energy system research through a collection of tools.
40+
| The primary module, the Open Energy Platform (OEP), offers a web interface for accessing various tools and the community database.
41+
42+
43+
Documentation
44+
=============
45+
| The documentation is created with Markdown using `MkDocs <https://www.mkdocs.org/>`_ and `mike <https://github.com/jimporter/mike>`_.
46+
| All files are stored in the ``docs`` folder of the repository.
47+
| A **GitHub Actions** deploys the ``develop`` branch on a **GitHub Page**.
48+
| The documentation page is: `openenergyplatform.github.io/oeplatform/ <https://openenergyplatform.github.io/oeplatform/>`_
49+
50+
Collaboration
51+
=============
52+
| Everyone is invited to develop this repository with good intentions.
53+
| Please follow the workflow described in the `CONTRIBUTING.md <https://github.com/OpenEnergyPlatform/oeplatform/blob/master/CONTRIBUTING.md>`_.
54+
55+
Contributors:
56+
57+
.. figure:: https://contrib.rocks/image?repo=OpenEnergyPlatform/oeplatform
58+
:align: left
59+
:target: https://github.com/OpenEnergyPlatform/oeplatform/graphs/contributors
60+
:alt: [contrib.rocks](https://contrib.rocks)
61+
62+
License and Citation
63+
====================
64+
| The code of this repository is licensed under the **GNU Affero General Public License v3.0 or later** (AGPL-3.0-or-later).
65+
| Authorship and license for each file are documented using `REUSE <https://api.reuse.software/info/github.com/OpenEnergyPlatform/oeplatform>`_ specification.
66+
| See `LICENSE.txt <https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/LICENSE.txt>`_ for rights and obligations.
67+
| See the *Cite this repository* function or `CITATION.cff <https://github.com/OpenEnergyPlatform/oeplatform/blob/master/CITATION.cff>`_ for citation of this repository.
68+
| Copyright: `oeplatform <https://github.com/OpenEnergyPlatform/oeplatform/>`_ © OEP-Developers | `AGPL-3.0-or-later <LICENSE.txt>`_
69+
70+
71+
.. |badge_license| image:: https://img.shields.io/github/license/OpenEnergyPlatform/oeplatform
72+
:target: https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/LICENSE.txt
73+
:alt: License
74+
75+
.. |badge_reuse| image:: https://api.reuse.software/badge/github.com/OpenEnergyPlatform/oeplatform
76+
:target: https://api.reuse.software/info/github.com/OpenEnergyPlatform/oeplatform
77+
:alt: REUSE
78+
79+
.. |badge_documentation| image:: https://img.shields.io/github/actions/workflow/status/OpenEnergyPlatform/oeplatform/deploy-docs.yaml?branch=develop&label=documentation
80+
:target: https://openenergyplatform.github.io/oeplatform/
81+
:alt: Documentation
82+
83+
.. |badge_mkdocs| image:: https://img.shields.io/badge/Material_for_MkDocs-526CFE?style=flat&logo=MaterialForMkDocs&logoColor=white&color=grey
84+
:target: https://squidfunk.github.io/mkdocs-material/
85+
:alt: MkDocs
86+
87+
.. |badge_tox| image:: https://img.shields.io/github/actions/workflow/status/OpenEnergyPlatform/oeplatform/automated-testing.yaml?label=tox
88+
:target: https://github.com/OpenEnergyPlatform/oeplatform/actions/workflows/automated-testing.yaml
89+
:alt: Tox Tests
90+
91+
.. |badge_issue_open| image:: https://img.shields.io/github/issues-raw/OpenEnergyPlatform/oeplatform
92+
:target: https://github.com/OpenEnergyPlatform/oeplatform/issues
93+
:alt: Open Issues
94+
95+
.. |badge_issue_closes| image:: https://img.shields.io/github/issues-closed-raw/OpenEnergyPlatform/oeplatform
96+
:target: https://github.com/OpenEnergyPlatform/oeplatform/issues?q=is%3Aissue+is%3Aclosed
97+
:alt: Closed Issues
98+
99+
.. |badge_pr_open| image:: https://img.shields.io/github/issues-pr-raw/OpenEnergyPlatform/oeplatform
100+
:target: https://github.com/OpenEnergyPlatform/oeplatform/pulls
101+
:alt: Open PR
102+
103+
.. |badge_pr_closes| image:: https://img.shields.io/github/issues-pr-closed-raw/OpenEnergyPlatform/oeplatform
104+
:target: https://github.com/OpenEnergyPlatform/oeplatform/pulls?q=is%3Apr+is%3Aclosed
105+
:alt: Closed PR
106+
107+
.. |badge_contributions| image:: https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat
108+
:target: https://github.com/OpenEnergyPlatform/oeplatform/blob/master/CONTRIBUTING.md
109+
:alt: Contributions
110+
111+
.. |badge_contributors| image:: https://img.shields.io/github/contributors/OpenEnergyPlatform/oeplatform
112+
:target: https://github.com/OpenEnergyPlatform/oeplatform/graphs/contributors
113+
:alt: Contributors
114+
115+
.. |badge_repo_counts| image:: https://hits.sh/github.com/OpenEnergyPlatform/oeplatform.svg
116+
:target: https://hits.sh/github.com/OpenEnergyPlatform/oeplatform/
117+
:alt: Hits

REUSE.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,14 @@ SPDX-FileCopyrightText = [
261261
"2023 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut",
262262
]
263263

264+
[[annotations]]
265+
path = "docs/img/banner_oefamily_oep.png"
266+
precedence = "override"
267+
SPDX-License-Identifier = [ "CC-BY-4.0",]
268+
SPDX-FileCopyrightText = [
269+
"2025 Ludwig Hülk <https://github.com/Ludee> © Reiner Lemoine Institut",
270+
]
271+
264272
[[annotations]]
265273
path = "docs/oeplatform-code/web-api/oekg-api/oekg.yaml"
266274
precedence = "override"
@@ -3295,6 +3303,14 @@ SPDX-FileCopyrightText = [
32953303
"2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut",
32963304
]
32973305

3306+
[[annotations]]
3307+
path = "dataedit/management/data/**"
3308+
precedence = "override"
3309+
SPDX-License-Identifier = "CC0-1.0"
3310+
SPDX-FileCopyrightText = [
3311+
"2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut",
3312+
]
3313+
32983314
[[annotations]]
32993315
path = "dataedit/static/database/css/database-enhancements.css"
33003316
precedence = "override"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0
1+
1.3.2

dataedit/templates/dataedit/dataview.html

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,20 @@ <h1 class="main-header__title">
191191
Metadata specification
192192
</a>
193193
</span>
194-
<button onclick="downloadMetadata();" data-bs-toggle="tooltip" title="Download metadata in JSON format"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-download me-2" viewBox="0 0 16 16">
195-
<path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
196-
<path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
197-
</svg>Download JSON</button>
194+
<div class="dropdown">
195+
<button class="btn btn-secondary dropdown-toggle" type="button" id="metadataDropdown" data-bs-toggle="dropdown" aria-expanded="false" title="Download or view metadata">
196+
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-download me-2" viewBox="0 0 16 16">
197+
<path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
198+
<path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
199+
</svg>
200+
Metadata Options
201+
</button>
202+
<ul class="dropdown-menu" aria-labelledby="metadataDropdown">
203+
<li><a class="dropdown-item" href="#" onclick="downloadMetadata(); return false;">Download JSON</a></li>
204+
<li><a class="dropdown-item" href="#" onclick="openMetadataApiPage(); return false;">Open Metadata API Page</a></li>
205+
</ul>
206+
</div>
207+
198208

199209
<span {% if not can_add or opr.opr_id and not opr.is_finished %} data-bs-toggle="tooltip" title="You need write permissions on this table to edit metadata. If you have permissions it is likely that a metadata review is in progress, data can't be changed during ongoing Open Peer Reviews." {% endif %}>
200210
<a href="{{table}}/meta_edit" type="button" class="btn btn-primary btn-sm {% if not can_add or opr.opr_id and not opr.is_finished %} disabled {% endif %}">
@@ -549,6 +559,11 @@ <h2 class="table-sidebar__heading">API Usage</h2>
549559
})
550560
};
551561

562+
var openMetadataApiPage = function () {
563+
var metaUrl = "/api/v0/schema/{{ schema }}/tables/{{ table }}/meta";
564+
window.open(metaUrl, "_blank");
565+
};
566+
552567
DataEdit(table=table, schema=schema);
553568

554569
$(function () {

0 commit comments

Comments
 (0)