Skip to content

Commit 3d9e7bb

Browse files
authored
Merge pull request #2153 from OpenEnergyPlatform/release-v1.5.2
Release v1.5.2
2 parents fba3638 + 3c0f19c commit 3d9e7bb

File tree

343 files changed

+20486
-12308
lines changed

Some content is hidden

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

343 files changed

+20486
-12308
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.5.1
2+
current_version = 1.5.2
33

44
[bumpversion:file:VERSION]
55

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dockerComposeFile": ["../docker-compose.dev.yaml"],
44
"service": "web",
55
"workspaceFolder": "/home/appuser/app",
6-
"forwardPorts": [8000, 5678],
6+
"forwardPorts": [8000, 5678, 5500],
77
"shutdownAction": "stopCompose",
88
"remoteUser": "appuser",
99

.github/ISSUE_TEMPLATE/issue_template_bug.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
22
name: Bug Issue
33
about: For bugs and errors
4-
title: Your title should make sense if said after "The issue is <your issue title>"
4+
title:
5+
Your title should make sense if said after "The issue is <your issue title>"
56
labels: "bug"
67
assignees: ""
78
---
89

910
## Description of the issue
1011

11-
Describe the problem in as much detail as possible.
12-
Focus on the expected and current behavior.
13-
If necessary, create a screenshot and insert below.
12+
Describe the problem in as much detail as possible. Focus on the expected and
13+
current behavior. If necessary, create a screenshot and insert below.
1414

1515
## Steps to Reproduce
1616

@@ -30,4 +30,5 @@ Describe possible ideas for solution and evaluate advantages and disadvantages.
3030

3131
## Workflow checklist
3232

33-
- [ ] I am aware of the workflow in [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/CONTRIBUTING.md)
33+
- [ ] I am aware of the workflow in
34+
[CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/CONTRIBUTING.md)

.github/ISSUE_TEMPLATE/issue_template_feature.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
name: Feature Issue
33
about: For new ideas, developments and features
4-
title: Your title should make sense if said after "The issue is <your issue title>"
4+
title:
5+
Your title should make sense if said after "The issue is <your issue title>"
56
labels: "enhancement"
67
assignees: ""
78
---
@@ -16,4 +17,5 @@ Describe possible ideas for solution and evaluate advantages and disadvantages.
1617

1718
## Workflow checklist
1819

19-
- [ ] I am aware of the workflow in [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/CONTRIBUTING.md)
20+
- [ ] I am aware of the workflow in
21+
[CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/CONTRIBUTING.md)

.github/pull_request_template.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,28 @@ Describe the findings of the discussion in the issue or meeting.
66

77
### Features
88

9-
- Add a new functionality [(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
9+
- Add a new functionality
10+
[(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
1011

1112
### Changes
1213

13-
- Update existing functionality [(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
14+
- Update existing functionality
15+
[(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
1416

1517
### Bugs
1618

17-
- Fixed a problem with [(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
19+
- Fixed a problem with
20+
[(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
1821

1922
### Removed
2023

21-
- Remove a broken link [(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
24+
- Remove a broken link
25+
[(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
2226

2327
### Documentation updates
2428

25-
- Updated documentation for [(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
29+
- Updated documentation for
30+
[(#)](https://github.com/OpenEnergyPlatform/oeplatform/pull/)
2631

2732
## Workflow checklist
2833

@@ -32,11 +37,15 @@ Closes #
3237

3338
### PR-Assignee
3439

35-
- [ ] 🐙 Follow the workflow in [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/CONTRIBUTING.md)
36-
- [ ] 📝 Update the [CHANGELOG.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/versions/changelogs/current.md)
37-
- [ ] 📙 Update the documentation on [mkdocs](https://openenergyplatform.github.io/oeplatform/)
40+
- [ ] 🐙 Follow the workflow in
41+
[CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/CONTRIBUTING.md)
42+
- [ ] 📝 Update the
43+
[CHANGELOG.md](https://github.com/OpenEnergyPlatform/oeplatform/blob/develop/versions/changelogs/current.md)
44+
- [ ] 📙 Update the documentation on
45+
[mkdocs](https://openenergyplatform.github.io/oeplatform/)
3846

3947
### Reviewer
4048

41-
- [ ] 🐙 Follow the [Reviewer Guidelines](https://github.com/rl-institut/super-repo/blob/develop/CONTRIBUTING.md#40-let-someone-else-review-your-pr)
49+
- [ ] 🐙 Follow the
50+
[Reviewer Guidelines](https://github.com/rl-institut/super-repo/blob/develop/CONTRIBUTING.md#40-let-someone-else-review-your-pr)
4251
- [ ] 🐙 Provided feedback and show sufficient appreciation for the work done

.github/workflows/automated-testing.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,14 @@ jobs:
3636
ports:
3737
- 5432:5432
3838
options: >-
39-
--health-cmd pg_isready
40-
--health-interval 10s
41-
--health-timeout 5s
39+
--health-cmd pg_isready --health-interval 10s --health-timeout 5s
4240
--health-retries 5
4341
fuseki:
4442
image: stain/jena-fuseki
4543
ports:
4644
- 3030:3030
4745
options: >-
48-
--name fuseki
49-
-e FUSEKI_DATASET_1=ds
50-
-e FUSEKI_MEM_1=true
46+
--name fuseki -e FUSEKI_DATASET_1=ds -e FUSEKI_MEM_1=true
5147
5248
strategy:
5349
matrix:
@@ -64,8 +60,8 @@ jobs:
6460
- name: Set up JDK 11
6561
uses: actions/setup-java@v4
6662
with:
67-
distribution: 'temurin'
68-
java-version: '11'
63+
distribution: "temurin"
64+
java-version: "11"
6965
- name: Wait for Fuseki to start
7066
run: |
7167
for i in {1..30}; do

.github/workflows/image-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Create and publish a Docker image
33
on:
44
push:
55
tags:
6-
- 'v*'
6+
- "v*"
77

88
env:
99
REGISTRY: ghcr.io

.markdownlint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"MD013": false,
3+
"MD029": false,
4+
"MD030": false
5+
}

.pre-commit-config.yaml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
exclude: ^.*(.min.js|.min.css|.js.map|html|js|jsx|tsx|jsonc|yaml|yml|scss|docs/.*|mkdocs.yml|/dist/.*)$
2-
repos:
3-
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v6.0.0
5-
hooks:
6-
- id: check-yaml
7-
- id: end-of-file-fixer
8-
- id: trailing-whitespace
9-
- repo: https://github.com/psf/black
10-
rev: 25.9.0
11-
hooks:
12-
- id: black
13-
- repo: https://github.com/pycqa/isort
14-
rev: 7.0.0
15-
hooks:
16-
- id: isort
17-
args: ["--profile", "black", "--filter-files"]
18-
- repo: https://github.com/pycqa/flake8
19-
rev: 7.3.0
20-
hooks:
21-
- id: flake8
22-
args: ["--max-line-length=88", "--ignore=E20,W503"] # black compatible
23-
- repo: https://github.com/pre-commit/mirrors-eslint
24-
rev: v9.37.0
25-
hooks:
26-
- id: eslint
27-
additional_dependencies:
28-
29-
30-
31-
args: ["--fix"]
32-
- repo: https://github.com/pre-commit/mirrors-prettier
33-
rev: v4.0.0-alpha.8
34-
hooks:
35-
- id: prettier
36-
additional_dependencies:
37-
- prettier-plugin-jinja-template
38-
- prettier-plugin-sql
1+
exclude: ^.*(.min.js|.min.css|.js.map|js|jsx|tsx|jsonc|scss|mkdocs.yml|/dist/.*)$
2+
repos:
3+
- repo: https://github.com/pre-commit/pre-commit-hooks
4+
rev: v6.0.0
5+
hooks:
6+
- id: check-yaml
7+
- id: end-of-file-fixer
8+
- id: trailing-whitespace
9+
- repo: https://github.com/psf/black
10+
rev: 25.9.0
11+
hooks:
12+
- id: black
13+
- repo: https://github.com/pycqa/isort
14+
rev: 7.0.0
15+
hooks:
16+
- id: isort
17+
args: ["--profile", "black", "--filter-files"]
18+
- repo: https://github.com/pycqa/flake8
19+
rev: 7.3.0
20+
hooks:
21+
- id: flake8
22+
args: ["--max-line-length=88", "--ignore=E20,W503"] # black compatible
23+
- repo: https://github.com/pre-commit/mirrors-eslint
24+
rev: v9.37.0
25+
hooks:
26+
- id: eslint
27+
additional_dependencies:
28+
29+
30+
31+
args: ["--fix"]
32+
- repo: https://github.com/pre-commit/mirrors-prettier
33+
rev: v4.0.0-alpha.8
34+
hooks:
35+
- id: prettier
36+
additional_dependencies:
37+
- prettier-plugin-jinja-template
38+
- prettier-plugin-sql

.prettierignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Ignore all HTML files, because they contain
2-
# django markup that will not be broken by prettier
3-
**/*.html
1+
# prettier: could not determine a constructor for the tag 'tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji' in "mkdocs.yml"
42

5-
docs/*
3+
mkdocs.yml

0 commit comments

Comments
 (0)