From 2d1064476062543097b74f545f2709e78a48c592 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 1 Feb 2023 18:57:31 +0100 Subject: [PATCH 1/8] Updating sphinx dependencies --- docs/readthedocs/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index bc20d8217..66fcfd2c5 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,4 +1,4 @@ commonmark==0.9.1 recommonmark==0.7.1 -Sphinx==4.2.0 -sphinx-rtd-theme==1.0.0 \ No newline at end of file +Sphinx==5.3.0 +sphinx-rtd-theme==1.1.1 From dc897c28752e33c8916def2259431fb091a6eb79 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 1 Feb 2023 18:59:54 +0100 Subject: [PATCH 2/8] Adding sphinx dependencies to dependabot surveillance --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7174415d6..3ba92939b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,7 +12,16 @@ updates: - sensarmad - sebastian-peter - danielfeismann + - jo-bao ignore: - dependency-name: org.spockframework:spock-core versions: - 2.3-groovy-4.0 + +- package-ecosystem: pip + directory: "/docs/readthedocs" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 8 + target-branch: dev From e1a03adc2f176592f9c9520c210f6b0ba8d0771a Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 1 Feb 2023 19:09:45 +0100 Subject: [PATCH 3/8] Fixing sphinx warnings --- docs/readthedocs/models/models.rst | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/readthedocs/models/models.rst b/docs/readthedocs/models/models.rst index 265730697..9b738fb72 100644 --- a/docs/readthedocs/models/models.rst +++ b/docs/readthedocs/models/models.rst @@ -24,7 +24,7 @@ Immutability Copyable With the general design principle of immutability, entity modifications (e.g. updates of field values) can become hard and annoying. To avoid generating methods to update each field value, we provide an adapted version of the - `builder pattern `_ to make entity modifications as easy as possible. + `builder pattern `__ to make entity modifications as easy as possible. Each entity holds it's own copy builder class, which follows the same inheritance as the entity class itself. With a call of `.copy()` on an entity instance a builder instance is returned, that allows for modification of fields and can be terminated with `.build()` which will return an instance of the entity with modified field values as required. @@ -50,7 +50,7 @@ Harmonized Units System Equality Checks To represent quantities in the models within an acceptable accuracy, the JSR 385 reference implementation - `Indriya `_ is used. Comparing quantity objects or objects holding quantity + `Indriya `__ is used. Comparing quantity objects or objects holding quantity instances is not as trivial as it might seem, because there might be different understandings about the equality of quantities (e.g. there is a big difference between two instances being equal or equivalent). After long discussions how to treat quantities in the entity :code:`equals()` method, we agreed on the following rules to be applied: @@ -74,12 +74,12 @@ Equality Checks would return :code:`false` as the equality check does NOT convert units. If you want to compare two entity instances based on their equivalence you have (for now) check for each quantity manually using their :code:`isEquivalentTo()` method. If you think you would benefit from a standard method that allows entity equivalence check, please consider - handing in an issue `here `_. + handing in an issue `here `__. Furthermore, the current existing implementation of :code:`isEquivalentTo()` in indriya does not allow the provision of a tolerance threshold that might be necessary when comparing values from floating point operations. We consider - providing such a method in our `PowerSystemUtils `_ library. + providing such a method in our `PowerSystemUtils `__ library. If you think you would benefit from such a method, please consider handing in an issue - `here `_. + `here `__. Conditional Parameters Some of the models have conditional parameters. When reading model data from a data source, their respective factories for building these @@ -97,8 +97,8 @@ Model classes you can use to describe a data set as input to power system simula input/operator -Grid Related Models -=================== +Grid Related Input Models +========================= .. toctree:: :maxdepth: 1 @@ -112,8 +112,8 @@ Grid Related Models input/grid/measurementunit input/grid/gridcontainer -Participant Related Models -========================== +Participant Related Input Models +================================ .. toctree:: :maxdepth: 1 @@ -137,8 +137,8 @@ Result ****** Model classes you can use to describe the outcome of a power system simulation. -Grid Related Models -=================== +Grid Related Result Models +========================== .. toctree:: :maxdepth: 1 @@ -150,8 +150,8 @@ Grid Related Models result/grid/transformer2w result/grid/transformer3w -Participant Related Models -========================== +Participant Related Result Models +================================= .. toctree:: :maxdepth: 1 From fff8b23bc423e814fcd8b961ccaaf99e0f24c51e Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 1 Feb 2023 19:10:24 +0100 Subject: [PATCH 4/8] Updating maintainers list --- docs/readthedocs/index.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/readthedocs/index.rst b/docs/readthedocs/index.rst index 2074b7ef6..0b29cbfb4 100644 --- a/docs/readthedocs/index.rst +++ b/docs/readthedocs/index.rst @@ -19,8 +19,10 @@ Contact the (Main) Maintainers If you feel, something this missing, wrong or misleading, please contact one of our main contributors: * `@sensarmad `_ - * `@johanneshiry `_ - * `@ckittl `_ + * `@t-ober `_ + * `@danielfeismann `_ + * `@sebastian-peter `_ + * `@jo-bao `_ Hat tip to all other contributors! From 12da40aa7ece0cddc07312a30d1a8ec65c76a92e Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 1 Feb 2023 19:13:18 +0100 Subject: [PATCH 5/8] Added to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2b77414..4bab2c35d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `ThermalGrid` as a container for a completely connected thermal grid - `EmResult` and `FlexOptionsResult` for Energy Management Systems [#651](https://github.com/ie3-institute/PowerSystemDataModel/issues/651) - `EvcsInput` now has a parameter for enabling and disabling vehicle to grid support [#681](https://github.com/ie3-institute/PowerSystemDataModel/issues/681) +- Added Dependabot updates to sphinx/readthedocs dependencies [#735](https://github.com/ie3-institute/PowerSystemDataModel/issues/735) ### Fixed - Reduced code smells [#492](https://github.com/ie3-institute/PowerSystemDataModel/issues/492) From 098a40bf9358b8a12b3cc89544b27bb10a7944a5 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Thu, 9 Feb 2023 08:33:31 +0100 Subject: [PATCH 6/8] Update docs/readthedocs/index.rst Adding Julian to authors as well Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com> --- docs/readthedocs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/index.rst b/docs/readthedocs/index.rst index 0b29cbfb4..6f7ce6f29 100644 --- a/docs/readthedocs/index.rst +++ b/docs/readthedocs/index.rst @@ -23,7 +23,7 @@ If you feel, something this missing, wrong or misleading, please contact one of * `@danielfeismann `_ * `@sebastian-peter `_ * `@jo-bao `_ - +@julianhohmann `_ Hat tip to all other contributors! Indices and tables From 78de52c975dd86d0dd092f8b5b22c9743df85ba0 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Mon, 13 Feb 2023 13:52:43 +0100 Subject: [PATCH 7/8] Update docs/readthedocs/index.rst Fixing Julian's contact info Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com> --- docs/readthedocs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/index.rst b/docs/readthedocs/index.rst index 6f7ce6f29..58e3b1a87 100644 --- a/docs/readthedocs/index.rst +++ b/docs/readthedocs/index.rst @@ -23,7 +23,7 @@ If you feel, something this missing, wrong or misleading, please contact one of * `@danielfeismann `_ * `@sebastian-peter `_ * `@jo-bao `_ -@julianhohmann `_ +* `@julianhohmann `_ Hat tip to all other contributors! Indices and tables From e0c1787011d469ca5bf74570033fb616917e0a49 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Mon, 13 Feb 2023 13:54:11 +0100 Subject: [PATCH 8/8] Fixing list spacing --- docs/readthedocs/index.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/readthedocs/index.rst b/docs/readthedocs/index.rst index 58e3b1a87..edae434d4 100644 --- a/docs/readthedocs/index.rst +++ b/docs/readthedocs/index.rst @@ -23,7 +23,8 @@ If you feel, something this missing, wrong or misleading, please contact one of * `@danielfeismann `_ * `@sebastian-peter `_ * `@jo-bao `_ -* `@julianhohmann `_ + * `@julianhohmann `_ + Hat tip to all other contributors! Indices and tables