From ae80393824d31e894d3f47cf3a675292a072e74c Mon Sep 17 00:00:00 2001 From: danielfeismann Date: Wed, 2 Aug 2023 09:31:47 +0200 Subject: [PATCH 01/16] update sphinx, rtd-template, etc. --- docs/readthedocs/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index 79cf29e920..9c0f1f4e7a 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,7 +1,7 @@ -Sphinx==5.3.0 -sphinx-rtd-theme==1.1.1 +Sphinx==7.1.2 +sphinx-rtd-theme==1.2.2 sphinxcontrib-plantuml==0.25 -myst-parser==1.0.0 -markdown-it-py==2.2.0 +myst-parser==2.0.0 +markdown-it-py==3.0.0 sphinx-hoverxref==1.3.0 sphinxcontrib-bibtex==2.5.0 From c694bca9e4ec46b539d387b6674e9f360b4b4e6e Mon Sep 17 00:00:00 2001 From: danielfeismann Date: Wed, 2 Aug 2023 09:35:43 +0200 Subject: [PATCH 02/16] update sphinx 6 --- docs/readthedocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index 9c0f1f4e7a..a29db4b4d2 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==7.1.2 +Sphinx==6.2.1 sphinx-rtd-theme==1.2.2 sphinxcontrib-plantuml==0.25 myst-parser==2.0.0 From 10f0dd693565304fabb1b6a3a0d1d0989e979f55 Mon Sep 17 00:00:00 2001 From: danielfeismann Date: Fri, 25 Aug 2023 13:40:04 +0200 Subject: [PATCH 03/16] test rtd again --- 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 0ceda462bf..d6ada32baf 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,5 +1,5 @@ -Sphinx==6.2.1 -sphinx-rtd-theme==1.2.2 +Sphinx==7.2.3 +sphinx-rtd-theme==1.3.0 sphinxcontrib-plantuml==0.25 myst-parser==2.0.0 markdown-it-py==3.0.0 From 4a970c926909bcb70787a98b35f7ba35344d44a0 Mon Sep 17 00:00:00 2001 From: danielfeismann Date: Fri, 15 Sep 2023 11:50:20 +0200 Subject: [PATCH 04/16] Sphinx==7.2.6 --- docs/readthedocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index d6ada32baf..4da03595cf 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==7.2.3 +Sphinx==7.2.6 sphinx-rtd-theme==1.3.0 sphinxcontrib-plantuml==0.25 myst-parser==2.0.0 From 50f91770fd8fc703b4bbae988e4940a8c7f2685e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=BCtte?= Date: Mon, 27 Nov 2023 12:52:32 +0100 Subject: [PATCH 05/16] deleted doubled line in vn_simona.conf --- input/samples/vn_simona/vn_simona.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/input/samples/vn_simona/vn_simona.conf b/input/samples/vn_simona/vn_simona.conf index 40a921adae..353ce6fdec 100644 --- a/input/samples/vn_simona/vn_simona.conf +++ b/input/samples/vn_simona/vn_simona.conf @@ -4,7 +4,6 @@ include "../common/akka.conf" # ATTENTION: Do not change this config file directly but use it as a base for your personal delta config for the # vn_simona scenario! Delta configs can be created by including the config you want to change # parameters from via include (e.g. include "input/samples/vn_simona/vn_simona.conf") at the -# parameters from via include (e.g. include "input/samples/vn_simona/vn_simona.conf") at the # beginning of your config file and then just override the parameters you want to change! ######### From 21e39075a34a69f081605de2f1ffb79000108838 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Tue, 28 Nov 2023 12:34:20 +0100 Subject: [PATCH 06/16] Updating rtd-theme to 2.0.0 --- docs/readthedocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index 4da03595cf..2082651fbd 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,5 +1,5 @@ Sphinx==7.2.6 -sphinx-rtd-theme==1.3.0 +sphinx-rtd-theme==2.0.0 sphinxcontrib-plantuml==0.25 myst-parser==2.0.0 markdown-it-py==3.0.0 From d876da6016d021e4a82bdc3f7921e523fbaa2a8b Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Tue, 28 Nov 2023 15:07:09 +0100 Subject: [PATCH 07/16] Updating sphinx to 7.3.0 --- docs/readthedocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index 0673e4d96f..731f04274a 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==7.2.6 +Sphinx==7.3.0 sphinx-rtd-theme==2.0.0 sphinxcontrib-plantuml==0.27 myst-parser==2.0.0 From 0d12be9885de1bbccf72bba59c08a9e903eeb66e Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Tue, 28 Nov 2023 15:10:23 +0100 Subject: [PATCH 08/16] Revert "Updating sphinx to 7.3.0" This reverts commit d876da6016d021e4a82bdc3f7921e523fbaa2a8b. --- docs/readthedocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index 731f04274a..0673e4d96f 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==7.3.0 +Sphinx==7.2.6 sphinx-rtd-theme==2.0.0 sphinxcontrib-plantuml==0.27 myst-parser==2.0.0 From b4bfcc2d77f123d64b5e80d8d17fc81983de145a Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 29 Nov 2023 10:17:29 +0100 Subject: [PATCH 09/16] Undo merge glitch --- docs/readthedocs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt index 0673e4d96f..bd2e90f529 100644 --- a/docs/readthedocs/requirements.txt +++ b/docs/readthedocs/requirements.txt @@ -4,4 +4,4 @@ sphinxcontrib-plantuml==0.27 myst-parser==2.0.0 markdown-it-py==3.0.0 sphinx-hoverxref==1.3.0 -sphinxcontrib-bibtex==2.6.0 +sphinxcontrib-bibtex==2.6.1 From ae0d3ccb8118b22b5d3ad5f87382e7e2053d519e Mon Sep 17 00:00:00 2001 From: danielfeismann Date: Wed, 29 Nov 2023 10:41:52 +0100 Subject: [PATCH 10/16] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d59f560569..c0903d7a1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -123,6 +123,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed broken layout in RTD documentation [#500](https://github.com/ie3-institute/simona/issues/500) - Corrected tests in RefSystemTest [#560](https://github.com/ie3-institute/simona/issues/560) - Take log file event filters from `logback.xml` when defining the run log appender [#108](https://github.com/ie3-institute/simona/issues/108) +- Fix rendering of references in documentation [#505](https://github.com/ie3-institute/simona/issues/505) ### Removed - Remove workaround for tscfg tmp directory [#178](https://github.com/ie3-institute/simona/issues/178) From bf26dd94a3049d0f7944a13c76e6ff27477ab8b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 13:13:20 +0000 Subject: [PATCH 11/16] Bump com.diffplug.spotless from 6.23.0 to 6.23.2 (#677) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9d2e38be0b..76c4a9891a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'signing' id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined) id 'pmd' // code check, working on source code - id 'com.diffplug.spotless' version '6.23.0'// code format + id 'com.diffplug.spotless' version '6.23.2'// code format id "com.github.ben-manes.versions" version '0.50.0' id "de.undercouch.download" version "5.5.0" // downloads plugin id "kr.motd.sphinx" version "2.10.1" // documentation generation From 6033e7023381dfd1d6fc49471ffce4d6d521a5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=BCtte?= Date: Sat, 2 Dec 2023 09:59:45 +0100 Subject: [PATCH 12/16] Addition in CHANGELOG for issues #658 and #642 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0903d7a1e..b1a91c5b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - New scheduling protocol [#650](https://github.com/ie3-institute/simona/issues/650) - Replaced akka with pekko [#641](https://github.com/ie3-institute/simona/issues/641) +### Fixed +-Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658) +-Removed version number "2.0" from the logo printed to console [#642](https://github.com/ie3-institute/simona/issues/642) + ## [3.0.0] - 2023-08-07 ### Added From 71bee633409492d368e005a4bc8ed1e6cabd85ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=BCtte?= Date: Sat, 2 Dec 2023 10:15:18 +0100 Subject: [PATCH 13/16] added a space before the text --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1a91c5b43..bcb6d36019 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,8 +28,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Replaced akka with pekko [#641](https://github.com/ie3-institute/simona/issues/641) ### Fixed --Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658) --Removed version number "2.0" from the logo printed to console [#642](https://github.com/ie3-institute/simona/issues/642) +- Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658) +- Removed version number "2.0" from the logo printed to console [#642](https://github.com/ie3-institute/simona/issues/642) ## [3.0.0] - 2023-08-07 From 0f85344e5562ae5686a7c4306761d2f6fa7c1362 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 08:05:42 +0000 Subject: [PATCH 14/16] Bump org.mockito:mockito-core from 5.7.0 to 5.8.0 (#680) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 76c4a9891a..6fb43436b6 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ dependencies { /* testing */ testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' testImplementation 'org.scalatestplus:mockito-3-4_2.13:3.2.10.0' - testImplementation 'org.mockito:mockito-core:5.7.0' // mocking framework + testImplementation 'org.mockito:mockito-core:5.8.0' // mocking framework testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.17" testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8' //scalatest html output testImplementation group: 'org.pegdown', name: 'pegdown', version: '1.6.0' From 63f9115bac202e35142c9980a4255c0dcdf3c597 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 08:13:26 +0000 Subject: [PATCH 15/16] Bump ch.qos.logback:logback-classic from 1.4.13 to 1.4.14 (#678) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6fb43436b6..c1dd342bec 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ dependencies { /* logging */ implementation "com.typesafe.scala-logging:scala-logging_${scalaVersion}:3.9.5" // pekko scala logging - implementation "ch.qos.logback:logback-classic:1.4.13" + implementation "ch.qos.logback:logback-classic:1.4.14" /* testing */ testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' From 2615c282891c0adae9b71e3d7175758fe63b727f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 08:22:34 +0000 Subject: [PATCH 16/16] Bump com.diffplug.spotless from 6.23.2 to 6.23.3 (#679) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c1dd342bec..016036315b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'signing' id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined) id 'pmd' // code check, working on source code - id 'com.diffplug.spotless' version '6.23.2'// code format + id 'com.diffplug.spotless' version '6.23.3'// code format id "com.github.ben-manes.versions" version '0.50.0' id "de.undercouch.download" version "5.5.0" // downloads plugin id "kr.motd.sphinx" version "2.10.1" // documentation generation