Skip to content

Commit 22ca7f6

Browse files
Merge branch 'dev' into ps/#554-HandlingNoWeatherData
2 parents faa36cf + c0aade4 commit 22ca7f6

File tree

163 files changed

+2108
-1752
lines changed

Some content is hidden

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

163 files changed

+2108
-1752
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Reviewers for Dependabot PRs
2+
build.gradle @sebastian-peter @danielfeismann @staudtMarius
3+
4+
# Reviewers for CI/CD related PRs
5+
.github/workflows/ @sebastian-peter @PhilippSchmelter

.github/dependabot.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ updates:
77
time: "04:00"
88
open-pull-requests-limit: 10
99
target-branch: dev
10-
reviewers:
11-
- t-ober
12-
- staudtMarius
13-
- sebastian-peter
14-
- danielfeismann
15-
- jo-bao
1610

1711
- package-ecosystem: pip
1812
directory: "/docs/readthedocs"

.github/workflows/ci.yml

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# © 2025. TU Dortmund University,
2+
# Institute of Energy Systems, Energy Efficiency and Energy Economics,
3+
# Research group Distribution grid planning and operation
4+
#
5+
6+
name: CI
7+
8+
on:
9+
push:
10+
paths-ignore:
11+
- 'docs/**'
12+
branches:
13+
- main
14+
- dev
15+
- 'hotfix/*'
16+
- 'rel/*'
17+
- 'dependabot/*'
18+
pull_request:
19+
branches:
20+
- main
21+
- dev
22+
23+
jobs:
24+
buildAndTest:
25+
runs-on: ubuntu-latest
26+
27+
steps:
28+
- name: Checkout Source
29+
uses: actions/checkout@v4
30+
with:
31+
fetch-depth: 0
32+
33+
- name: Setup Java
34+
uses: actions/setup-java@v4
35+
with:
36+
distribution: 'temurin'
37+
java-version: 17
38+
39+
- name: Setup Gradle
40+
uses: gradle/actions/setup-gradle@v4
41+
42+
- name: Check Branch
43+
run: |
44+
if [ "${{ github.event_name }}" == "pull_request" ]; then
45+
BRANCH_NAME="${{ github.head_ref }}"
46+
else
47+
BRANCH_NAME="${{ github.ref_name }}"
48+
fi
49+
50+
if [[ "$BRANCH_NAME" == refs/heads/* ]]; then
51+
BRANCH_NAME="${BRANCH_NAME#refs/heads/}"
52+
fi
53+
54+
export BRANCH_NAME
55+
56+
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
57+
58+
./gradlew checkBranchName -PbranchName="$BRANCH_NAME" --warning-mode=none
59+
60+
bash scripts/branch_type.sh
61+
62+
- name: Version Check
63+
if: ${{ github.event_name == 'pull_request' }}
64+
env:
65+
BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
66+
run: bash scripts/run-version-check.sh
67+
68+
- name: Build Project
69+
run: ./gradlew --refresh-dependencies clean assemble spotlessCheck
70+
71+
- name: Run Tests
72+
run: ./gradlew pmdMain pmdTest spotbugsMain spotbugsTest test jacocoTestReport jacocoTestCoverageVerification
73+
74+
- name: Build Java-Docs
75+
run: ./gradlew javadoc
76+
77+
- name: SonarQube
78+
run: |
79+
./gradlew sonar \
80+
-Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} \
81+
-Dsonar.host.url=${{ vars.SONAR_HOST_URL }} \
82+
-Dsonar.token="${{ secrets.SONAR_TOKEN }}" \
83+
-Dsonar.qualitygate.wait=true
84+
85+
#Deployment
86+
- name: Deploy
87+
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
88+
env:
89+
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVENCENTRAL_SIGNINGKEY }}
90+
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVENCENTRAL_SIGNINGPASS }}
91+
ORG_GRADLE_PROJECT_user: ${{ secrets.MAVENCENTRAL_USER }}
92+
ORG_GRADLE_PROJECT_password: ${{ secrets.MAVENCENTRAL_PASS }}
93+
run: |
94+
if [ "${GITHUB_REF}" == "refs/heads/main" ]; then
95+
currentVersion=$(./gradlew -q currentVersion)
96+
else
97+
currentVersion=$(./gradlew -q devVersion)
98+
fi
99+
100+
echo "currentVersion=$currentVersion"
101+
102+
./gradlew publish -PdeployVersion=$currentVersion
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Dependabot auto-merge
2+
on: pull_request
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'ie3-institute/PowerSystemDataModel'
12+
steps:
13+
- name: Dependabot metadata
14+
id: metadata
15+
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7
16+
with:
17+
github-token: "${{ secrets.GITHUB_TOKEN }}"
18+
19+
- name: Check Snapshot
20+
if: contains(steps.metadata.outputs.new-version, 'snap')
21+
run: |
22+
echo "::error::Snapshot versions are not allowed – workflow stopped."
23+
exit 1
24+
25+
- name: Approve the PR
26+
if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
27+
run: gh pr review --approve "$PR_URL"
28+
env:
29+
PR_URL: ${{github.event.pull_request.html_url}}
30+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
31+
32+
- name: Enable auto-merge for Dependabot PRs
33+
if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
34+
run: gh pr merge --auto --merge "$PR_URL"
35+
env:
36+
PR_URL: ${{ github.event.pull_request.html_url }}
37+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ version: 2
77

88
# Set the version of Python and other tools you might need
99
build:
10-
os: ubuntu-22.04
10+
os: ubuntu-24.04
1111
tools:
12-
python: "3.11"
12+
python: "3.13"
1313

1414
# Configure python
1515
python:

CHANGELOG.md

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased/Snapshot]
88

9+
### Added
10+
- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
11+
- Added `CITATION.cff` [#1380](https://github.com/ie3-institute/PowerSystemDataModel/issues/1380)
12+
13+
### Fixed
14+
- Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
15+
- Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
16+
- Fixed valid fields for `EmInput` [#1360](https://github.com/ie3-institute/PowerSystemDataModel/issues/1360)
17+
18+
### Changed
19+
- Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)
20+
- Extend azimuth angle range to [-180°, 180°] for PV inputs [#1330](https://github.com/ie3-institute/PowerSystemDataModel/issues/1330)
21+
- Improved error messages when reading and validating an invalid grid [#1354](https://github.com/ie3-institute/PowerSystemDataModel/issues/1354)
22+
- Changed `SubgridContainer` to represent galvanically seperated grids [#1226](https://github.com/ie3-institute/PowerSystemDataModel/issues/1226)
23+
24+
## [7.0.0] - 2025-05-08
25+
26+
### Added
27+
- Implemented GitHub Actions for automatic code integration. [#1237](https://github.com/ie3-institute/PowerSystemDataModel/issues/1237)
28+
- Added `CopyBuilders` to `Line-/Transformer2W-/Tranformer3WTypeInput` [#1275](https://github.com/ie3-institute/PowerSystemDataModel/issues/1275)
29+
- Implementing auto-merge for dependabot PRs [#1299](https://github.com/ie3-institute/PowerSystemDataModel/issues/1299)
30+
31+
### Fixed
32+
- Fixed SonarQube junit path issue in GitHub Actions [#1284](https://github.com/ie3-institute/PowerSystemDataModel/issues/1284)
33+
- Fixed no errors thrown in `getMapping()` in `TimeSeriesMappingSource` [#1287](https://github.com/ie3-institute/PowerSystemDataModel/issues/1287)
34+
35+
### Changed
36+
- Replaced `return this` with `return thisInstance` in CopyBuilders [#1250](https://github.com/ie3-institute/PowerSystemDataModel/issues/1250)
37+
- Removed Jenkinsfile [#1315](https://github.com/ie3-institute/PowerSystemDataModel/issues/1315)
38+
- Updated readthedocs config [#1317](https://github.com/ie3-institute/PowerSystemDataModel/issues/1317)
39+
40+
### Updates
41+
- Updated gradle to v8.14
42+
- Updated PSU to 3.1.0
43+
944
## [6.0.0] - 2025-02-27
1045

1146
### Added
@@ -23,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2358
- Added domestic hot water storage model [#1257](https://github.com/ie3-institute/PowerSystemDataModel/issues/1257)
2459
- Validation for BDEW load profile values [#1243](https://github.com/ie3-institute/PowerSystemDataModel/issues/1243)
2560
- Added load profiles sources [#1106](https://github.com/ie3-institute/PowerSystemDataModel/issues/1106)
61+
- Add `v2gSupport` parameter to documentation of `EvcsModel` [#1278](https://github.com/ie3-institute/PowerSystemDataModel/issues/1278)
2662

2763

2864
### Fixed
@@ -338,7 +374,8 @@ coordinates or multiple exactly equal coordinates possible
338374
- CsvDataSource now stops trying to get an operator for empty operator uuid field in entities
339375
- CsvDataSource now parsing multiple geoJson strings correctly
340376

341-
[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/6.0.0...HEAD
377+
[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...HEAD
378+
[7.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/6.0.0...7.0.0
342379
[6.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.1.0...6.0.0
343380
[5.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.1...5.1.0
344381
[5.0.1]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.0...5.0.1

CITATION.cff

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
cff-version: 1.0.0
2+
title: "PowerSystemDataModel - Provides an elaborated data model to model energy systems with a high granularity."
3+
message: "If you use this software, please cite it as below."
4+
type: software
5+
authors:
6+
- name: "ie³ - Institute of Energy Systems, Energy Efficiency and Energy Economics - TU Dortmund University"
7+
alias: ie³
8+
address: "Martin-Schmeißer-Weg 12"
9+
city: Dortmund
10+
country: DE
11+
post-code: 44227
12+
website: "https://ie3.etit.tu-dortmund.de/"
13+
- family-names: Hiry
14+
given-names: Johannes
15+
orcid: https://orcid.org/0000-0002-1447-0607
16+
- family-names: Kittl
17+
given-names: Chris
18+
orcid: https://orcid.org/0000-0002-1187-0568
19+
- family-names: Sen-Sarma
20+
given-names: Debopama
21+
- family-names: Peter
22+
given-names: Sebastian
23+
orcid: https://orcid.org/0000-0001-6311-6113
24+
- family-names: Oberließen
25+
given-names: Thomas
26+
orcid: https://orcid.org/0000-0001-5805-5408
27+
- family-names: Feismann
28+
given-names: Daniel
29+
orcid: https://orcid.org/0000-0002-3531-9025
30+
- family-names: Bao
31+
given-names: Johannes
32+
orcid: https://orcid.org/0009-0008-3641-6469
33+
- family-names: Hohmann
34+
given-names: Julian
35+
- family-names: Staudt
36+
given-names: Marius
37+
orcid: https://orcid.org/0009-0005-3309-5258
38+
- family-names: Steffan
39+
given-names: Niklas
40+
- family-names: Kraus
41+
given-names: Mia
42+
- family-names: Strehle
43+
given-names: Dennis
44+
- family-names: Mahr
45+
given-names: Christian
46+
- family-names: Zachopoulos
47+
given-names: Vasilios
48+
- family-names: Bajpai
49+
given-names: Shubham
50+
- family-names: Roumeliotis
51+
given-names: Lara
52+
- family-names: Bung
53+
given-names: Vicky
54+
- family-names: Hütte
55+
given-names: Simon
56+
- family-names: Petersmeier
57+
given-names: Pierre
58+
repository-code: https://github.com/ie3-institute/PowerSystemDataModel
59+
keywords:
60+
- power system data model
61+
- power system
62+
- energy system
63+
license: BSD-3-Clause
64+
version: 7.0.0
65+
date-released: 2025-06-05

0 commit comments

Comments
 (0)