Skip to content

Commit 0884191

Browse files
Merge pull request #1372 from ie3-institute/rel/df/#1371-release_8.0.0
Release 8.0.0
2 parents 8d7cc07 + 6065b1f commit 0884191

File tree

98 files changed

+790
-842
lines changed

Some content is hidden

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

98 files changed

+790
-842
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
./gradlew sonar \
8080
-Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} \
8181
-Dsonar.host.url=${{ vars.SONAR_HOST_URL }} \
82-
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
82+
-Dsonar.token="${{ secrets.SONAR_TOKEN }}" \
8383
-Dsonar.qualitygate.wait=true
8484
8585
#Deployment

.github/workflows/dependabot-auto-merge.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818

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+
1932
- name: Enable auto-merge for Dependabot PRs
2033
if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
2134
run: gh pr merge --auto --merge "$PR_URL"

CHANGELOG.md

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

77
## [Unreleased/Snapshot]
88

9+
### Added
10+
11+
### Fixed
12+
13+
### Changed
14+
15+
## [8.0.0] - 2025-07-17
16+
17+
### Added
18+
- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
19+
20+
### Fixed
21+
- Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
22+
- Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
23+
- Fixed valid fields for `EmInput` [#1360](https://github.com/ie3-institute/PowerSystemDataModel/issues/1360)
24+
25+
### Changed
26+
- Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)
27+
- Extend azimuth angle range to [-180°, 180°] for PV inputs [#1330](https://github.com/ie3-institute/PowerSystemDataModel/issues/1330)
28+
- Improved error messages when reading and validating an invalid grid [#1354](https://github.com/ie3-institute/PowerSystemDataModel/issues/1354)
29+
- Changed `SubgridContainer` to represent galvanically seperated grids [#1226](https://github.com/ie3-institute/PowerSystemDataModel/issues/1226)
30+
931
## [7.0.0] - 2025-05-08
1032

1133
### Added
@@ -357,7 +379,8 @@ coordinates or multiple exactly equal coordinates possible
357379
- CsvDataSource now stops trying to get an operator for empty operator uuid field in entities
358380
- CsvDataSource now parsing multiple geoJson strings correctly
359381

360-
[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...HEAD
382+
[Unreleased/Snapshot]:
383+
[8.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...8.0.0
361384
[7.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/6.0.0...7.0.0
362385
[6.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.1.0...6.0.0
363386
[5.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.1...5.1.0

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
id 'maven-publish'
55
id 'signing'
66
id 'pmd' // code check, working on source code
7-
id 'com.diffplug.spotless' version '7.0.3' //code format
8-
id 'com.github.spotbugs' version '6.1.11' // code check, working on byte code
7+
id 'com.diffplug.spotless' version '7.1.0' //code format
8+
id 'com.github.spotbugs' version '6.2.2' // code check, working on byte code
99
id 'de.undercouch.download' version '5.6.0'
1010
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
1111
id 'jacoco' // java code coverage plugin
12-
id "org.sonarqube" version "6.1.0.5360" // sonarqube
12+
id "org.sonarqube" version "6.2.0.5505" // sonarqube
1313
id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
1414
id "com.github.johnrengelman.shadow" version "8.1.1" // fat jar
1515
}
@@ -18,10 +18,10 @@ ext {
1818
//version (changing these should be considered thoroughly!)
1919
javaVersion = JavaVersion.VERSION_17
2020
groovyVersion = "4.0"
21-
groovyBinaryVersion = "4.0.26"
21+
groovyBinaryVersion = "4.0.27"
2222

2323
junitVersion = '1.12.0'
24-
testcontainersVersion = '1.21.0'
24+
testcontainersVersion = '1.21.3'
2525

2626
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
2727
}
@@ -81,7 +81,7 @@ dependencies {
8181
testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
8282
testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
8383
testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
84-
testImplementation 'net.bytebuddy:byte-buddy:1.17.5' // Mocks of classes
84+
testImplementation 'net.bytebuddy:byte-buddy:1.17.6' // Mocks of classes
8585

8686
// testcontainers (docker framework for testing)
8787
testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -91,15 +91,15 @@ dependencies {
9191
testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
9292

9393
// logging
94-
implementation platform('org.apache.logging.log4j:log4j-bom:2.24.3')
94+
implementation platform('org.apache.logging.log4j:log4j-bom:2.25.1')
9595
implementation 'org.apache.logging.log4j:log4j-api' // log4j
9696
implementation 'org.apache.logging.log4j:log4j-core' // log4j
9797
implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
9898

9999
// Databases
100100
implementation 'org.influxdb:influxdb-java:2.25'
101-
implementation 'com.couchbase.client:java-client:3.8.0'
102-
runtimeOnly 'org.postgresql:postgresql:42.7.5' // postgresql jdbc driver required during runtime
101+
implementation 'com.couchbase.client:java-client:3.8.3'
102+
runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
103103

104104
implementation 'commons-io:commons-io:2.19.0' // I/O functionalities
105105
implementation 'commons-codec:commons-codec:1.18.0' // needed by commons-compress
-3.02 KB
Loading

docs/readthedocs/_static/figures/transformerWithSwitchGear.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@
159159
\begin{tikzpicture}
160160
% === Anschlüsse ===
161161
\node[circle, draw = tuGreen, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_a) at (0,0){};
162-
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
163-
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
164-
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
162+
\node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
163+
\node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
164+
\node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
165165
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_e) at (62.5mm,0){};
166166

167167
\draw (port_a.west) -- ++(-3mm, -1mm) -- ++(0mm, -2mm) edge[densely dotted] ++(0mm, -1.8mm);
@@ -176,9 +176,9 @@
176176
\draw (port_d.east) -- (winding_a.west) (winding_b.east) -- (port_e.west);
177177

178178
\node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_a.south) {A \\ \SI{110}{\kV} \\ 1};
179-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 2};
180-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 2};
181-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 2};
179+
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1};
180+
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1};
181+
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1};
182182
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_e.south) {E \\ \SI{10}{\kV} \\ 2};
183183
\end{tikzpicture}
184184
\end{document}

docs/readthedocs/models/input/em.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Participants are connected to an EM each via their `em` field.
3737
-
3838
- String representation (e.g. name) of a control strategy
3939
40-
* - parentEm
40+
* - controllingEm
4141
-
4242
- Reference to a superior Energy Management Unit that is controlling this EM.
4343
Field can be empty or missing, if this EM itself is not controlled.

docs/readthedocs/models/input/grid/gridcontainer.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ and their higher voltage coupling point.
2424

2525
Let's shed a more detailed light on the boundaries of a sub grid as of our definition.
2626
This especially is important, if the switchgear of the transformer is modeled in detail.
27-
We defined, that all nodes in upstream direction of the transformer, that are connected by switches *only* (therefore
28-
are within the switchgear) are counted towards the inferior sub grid structure (here "2"), although they belong to a
29-
different voltage level.
30-
This decision is taken, because we assume, that the interest to operate on the given switchgear will most likely be
31-
placed in the inferior grid structure.
32-
33-
The "real" coupling node A is not comprised in the sub grids node collection, but obviously has reference through the
34-
switch between nodes A and B.
27+
We defined, that all nodes in upstream direction of the transformer, including those, which are within the switchgear are
28+
counted towards the superior sub grid structure (here "1"), because they belong to a different voltage level.
29+
If a switchgear should be operated by the inferior grid, one can set the operator, that is used in the inferior grid, for
30+
the switchgear. This can be necessary, if we assume, that the interest to operate on the given switchgear will most likely
31+
be placed in the inferior grid structure.
3532

3633
A synoptic overview of both classes' attributes is given here:
3734

0 commit comments

Comments
 (0)