Skip to content

Commit 124e45d

Browse files
authored
Merge pull request #580 from OpenEnergyPlatform/release-v0.14.5
Release v0.14.5
2 parents d17a92c + 16e5e54 commit 124e45d

38 files changed

+693
-288
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 = 0.14.4
2+
current_version = 0.14.5
33
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>(a|na))+(?P<build>\d+))?
44
serialize =
55
{major}.{minor}.{patch}{release}{build}

.github/ISSUE_TEMPLATE/issue_template_user_kudos.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ It helps the project quite a bit!
1212

1313
We will add you to the list of valued users.
1414

15-
Please, insert your information between the double quotes below - fill out at minimum "affiliation" :purple_heart:
15+
Please, insert your information below - fill out at minimum affiliation :purple_heart:
1616

17-
family-names: ""
18-
given-names: ""
19-
alias: ""
20-
affiliation: ""
21-
orcid: ""
17+
:pencil2: **Spaces** and the following special characters are allowed: @ ? ! | . , : ; - _ [ / ( ) \ ] § $ % & = + < >
18+
19+
family-names:
20+
given-names:
21+
alias:
22+
affiliation:
23+
orcid:
2224

2325
Thank you!

.github/workflows/ci-production.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: create package
3333
run: python -m build --sdist
3434
- name: import open-mastr
35-
run: python -m pip install ./dist/open_mastr-0.14.4.tar.gz
35+
run: python -m pip install ./dist/open_mastr-0.14.5.tar.gz
3636
- name: Create credentials file
3737
env:
3838
MASTR_TOKEN: ${{ secrets.MASTR_TOKEN }}

.github/workflows/extend_user_cff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ jobs:
8585
8686
Closes #${{ github.event.issue.number }}
8787
88-
Many thanks ${{ github.actor }}!
88+
Many thanks @${{ github.actor }}!

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
uses: pypa/gh-action-pypi-publish@release/v1
3636
with:
3737
password: ${{ secrets.PYPI_TEST }}
38-
repository_url: https://test.pypi.org/legacy/
38+
repository-url: https://test.pypi.org/legacy/

CHANGELOG.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,29 @@ For each version important additions, changes and removals are listed here.
66
The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
77
and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
88

9+
## [v0.14.5] New MaStR data model, battery export, various fixes - 2024-10-11
10+
### Added
11+
- Replace values in NetzbetreiberpruefungStatus with their entries from
12+
Katalogwerte
13+
[#583](https://github.com/OpenEnergyPlatform/open-MaStR/pull/583)
14+
- Add `deleted_market_actors` to data model and prevent crash on unknown tables
15+
[#575](https://github.com/OpenEnergyPlatform/open-MaStR/pull/575)
16+
- Extended documentation of data cleansing process for bulk download
17+
[#568](https://github.com/OpenEnergyPlatform/open-MaStR/pull/568)
18+
- Add OFFIS eV as partner organization
19+
[#493](https://github.com/OpenEnergyPlatform/open-MaStR/pull/493)
20+
### Changed
21+
- Fix usercff workflow
22+
[#545](https://github.com/OpenEnergyPlatform/open-MaStR/issues/544)
23+
- Fix docs on user-defined output path for csv, xml, database
24+
[#549](https://github.com/OpenEnergyPlatform/open-MaStR/issues/549)
25+
- Set pandas version to >=2.2.2 for compatibility with numpy v2.0
26+
[#553](https://github.com/OpenEnergyPlatform/open-MaStR/issues/553)
27+
- Allow to configure model/service port in `soap_api.download.MaStRAPI`
28+
[#556](https://github.com/OpenEnergyPlatform/open-MaStR/issues/556)
29+
- Allow CSV export of table `storage_units`
30+
[#565](https://github.com/OpenEnergyPlatform/open-MaStR/pull/565)
31+
932
## [v0.14.4] Release for the Journal of Open Source Software JOSS - 2024-06-07
1033
### Added
1134
- Extend documentation section `getting started` based on the JOSS Review [#523](https://github.com/OpenEnergyPlatform/open-MaStR/pull/523)
@@ -18,7 +41,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
1841
- Fixed missing call to gen_url in case first bulk download fails as xml file for today is not yet available [#534](https://github.com/OpenEnergyPlatform/open-MaStR/pull/534)
1942
- Repair links in the documentation page [#536](https://github.com/OpenEnergyPlatform/open-MaStR/pull/536)
2043

21-
2244
## [v0.14.3] Fix Pypi Release - 2024-04-24
2345
### Added
2446
- Add new table `changed_dso_assignment` [#510](https://github.com/OpenEnergyPlatform/open-MaStR/pull/510)

CITATION.cff

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,15 @@ authors:
2525
alias: "@deniztepe"
2626
affiliation: "fortiss"
2727
orcid: " https://orcid.org/0000-0002-7605-0173"
28+
- family-names: "Amme"
29+
given-names: "Jonathan"
30+
alias: "@nesnoj"
31+
affiliation: "Reiner Lemoine Institut"
32+
orcid: " https://orcid.org/0000-0002-8563-5261"
2833
title: "open-MaStR"
2934
type: software
3035
license: AGPL-3.0
31-
version: 0.14.4
36+
version: 0.14.5
3237
doi:
33-
date-released: 2024-06-07
38+
date-released: 2024-10-11
3439
url: "https://github.com/OpenEnergyPlatform/open-MaStR/"

CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@ git status
129129
```
130130

131131
#### 2.3. Commit your changes
132+
First, make sure you have the pre-commit hooks installed to have your code
133+
automatically checked on commit for programmatic and stylistic errors:
134+
```bash
135+
pre-commit install
136+
```
137+
138+
Now, let's add some file.
132139
If the file does not exist on the remote server yet, use:
133140
```bash
134141
git add filename.md

README.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
.. image:: https://user-images.githubusercontent.com/14353512/199113556-4b53660f-c628-4138-8d01-3719595ecda1.png
2+
.. image:: docs/images/README_HeaderThreePartners.svg
33
:align: left
44
:target: https://github.com/OpenEnergyPlatform/open-MaStR
55
:alt: MaStR logo
@@ -59,8 +59,6 @@ Documentation
5959
| Find the `documentation <https://open-mastr.readthedocs.io/en/latest/>`_ hosted on ReadTheDocs.
6060
6161
| The original API documentation can be found on the `Webhilfe des Marktstammdatenregisters <https://www.marktstammdatenregister.de/MaStRHilfe/subpages/webdienst.html>`_.
62-
| If you are interested in browsing the MaStR online, check out the privately hosted `Marktstammdatenregister.dev <https://marktstammdatenregister.dev/>`_.
63-
| Also see the `bundesAPI/Marktstammdaten-API <https://github.com/bundesAPI/marktstammdaten-api>`_ for another implementation.
6462
6563

6664
Installation
@@ -112,7 +110,13 @@ changes in a `Pull Request <https://github.com/OpenEnergyPlatform/open-MaStR/pul
112110
- `Wasserstoffatlas <https://wasserstoffatlas.de/>`_
113111
- `EE-Status App <https://ee-status.de/>`_
114112
- `Digiplan Anhalt <https://digiplan.rl-institut.de/>`_
113+
- `Data Quality Assessment of the MaStR <https://marktstammdaten.kotthoff.dev/>`_
115114

115+
External Resources
116+
===================
117+
Besides open-mastr, some other resources exist that ease the process of working with the Marktstammdatenregister:
118+
- If you are interested in browsing the MaStR online, check out the github organisation `Marktstammdatenregister.dev <https://github.com/marktstammdatenregister-dev>`_.
119+
- The `bundesAPI/Marktstammdaten-API <https://github.com/bundesAPI/marktstammdaten-api>`_ is another implementation to access data via an official API.
116120

117121
Collaboration
118122
=============
@@ -129,7 +133,7 @@ Software
129133
| This repository is licensed under the **GNU Affero General Public License v3.0 or later** (AGPL-3.0-or-later).
130134
| See `LICENSE.md <https://github.com/OpenEnergyPlatform/open-MaStR/blob/production/LICENSE.md>`_ for rights and obligations.
131135
| See the *Cite this repository* function or `CITATION.cff <https://github.com/OpenEnergyPlatform/open-MaStR/blob/production/CITATION.cff>`_ for citation of this repository.
132-
| Copyright: `open-MaStR <https://github.com/OpenEnergyPlatform/open-MaStR/>`_ © `Reiner Lemoine Institut <https://reiner-lemoine-institut.de/>`_ © `fortiss <https://www.fortiss.org/>`_ | `AGPL-3.0-or-later <https://www.gnu.org/licenses/agpl-3.0.txt>`_
136+
| Copyright: `open-MaStR <https://github.com/OpenEnergyPlatform/open-MaStR/>`_ © `Reiner Lemoine Institut <https://reiner-lemoine-institut.de/>`_ © `fortiss <https://www.fortiss.org/>`_ © `OFFIS <https://www.offis.de/>`_ | `AGPL-3.0-or-later <https://www.gnu.org/licenses/agpl-3.0.txt>`_
133137
134138
Data
135139
----

RELEASE_PROCEDURE.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,25 @@ It always has the format `YYYY-MM-DD`, e.g. `2022-05-16`.
4848
* On release day, start the release early to ensure sufficient time for reviews
4949
* Merge everything on the `develop` branch
5050

51-
### 5. 💠 Create a `release` branch
51+
### 5. Run tests and apply code linting
52+
* Run tests locally with `pytest` and fix errors
53+
* Apply linting with `pre-commit run -a` and fix errors
54+
55+
### 6. 💠 Create a `release` branch
5256
* Checkout `develop` and branch with `git checkout -b release-v0.12.1`
5357
* Update version for test release with `bump2version --current-version <current_version> --new-version <new_version> patch`
54-
* Commit version update with `git commit -am "version update v0.12.1a1"`
58+
* Commit version update with `git commit -am "version update v0.12.1"`
5559
* Push branch with `git push --set-upstream origin release-v0.12.1`
5660

57-
### 6. 📝 Update the version files
61+
### 7. 📝 Update the version files
5862
* `📝CHANGELOG.md`
5963
* All Pull Request are included
6064
* Add a new section with correct version number
6165
* Give the suitable name to the release
6266
* `📝CITATION.cff`
6367
* Update `date-released`
6468

65-
### 7. Optional: Check release on Test-PyPI
66-
69+
### 8. Optional: Check release on Test-PyPI
6770
* Check if the release it correctly displayed on [Test-PyPI](https://test.pypi.org/project/open-mastr/#history)
6871
* You can trigger the release manually within github actions using the `run workflow` button on branch `release-v0.12.1` on the workflow `Build and release on pypi tests`
6972
* Note: Pre-releases on Test-PyPI are only shown under `Release history` in the navigation bar.
@@ -72,7 +75,7 @@ It always has the format `YYYY-MM-DD`, e.g. `2022-05-16`.
7275
* Note: The release on Test-PyPI might fail, but it will be the correct release version for the PyPI server.
7376
* Push commits to the `release-*` branch
7477

75-
### 8. 🐙 Create a `Release Pull Request`
78+
### 9. 🐙 Create a `Release Pull Request`
7679
* Use `📝PR_TEMPLATE_RELEASE` (❗ToDo❗)
7780
* Merge `release` into `production` branch
7881
* Assign reviewers to check the release
@@ -81,7 +84,7 @@ It always has the format `YYYY-MM-DD`, e.g. `2022-05-16`.
8184
* Wait for reviews and tests
8285
* Merge PR
8386

84-
### 9. 💠 Set the `Git Tag`
87+
### 10. 💠 Set the `Git Tag`
8588
* Checkout `production` branch and pull
8689
* Check existing tags `git tag -n`
8790
* Create new tag: `git tag -a v0.12.1 -m "open-mastr release v0.12.1 with PyPI"`
@@ -91,7 +94,7 @@ It always has the format `YYYY-MM-DD`, e.g. `2022-05-16`.
9194
* Delete local tag: `git tag -d v0.12.1`
9295
* Delete remote tag: `git push --delete origin v0.12.1`
9396

94-
### 10. 🐙 Publish `Release` on GitHub and PyPI
97+
### 11. 🐙 Publish `Release` on GitHub and PyPI
9598
* Navigate to your [releases](https://github.com/OpenEnergyPlatform/open-MaStR/releases/) on GitHub and open your draft release.
9699
* Summarize key changes in the description
97100
* Use the `generate release notes` button provided by github (This only works after the release branch is merged on production)
@@ -103,7 +106,7 @@ It always has the format `YYYY-MM-DD`, e.g. `2022-05-16`.
103106

104107
▶️ In the background the GitHub workflow (pypi-publish.yml) will publish the package 📦 on PyPI!
105108

106-
### 11. 🐙 Set up new development
109+
### 12. 🐙 Set up new development
107110
* Create a Pull request from `release-*` to `develop`
108111
* Create a new **unreleased section** in the `📝CHANGELOG.md`
109112
```

0 commit comments

Comments
 (0)