Merge branch 'dev' into mb/#42-ba-feature-branch

# Conflicts:
#	CHANGELOG.md
#	input/samples/pcm/base.conf
#	input/samples/vn_146_lv_small/fullGrid/transformer_2_w_type_input.csv
#	input/samples/vn_simona/fullGrid/transformer_2_w_type_input.csv
#	src/main/resources/config/config-template.conf
#	src/main/scala/edu/ie3/simona/config/ConfigFailFast.scala
#	src/main/scala/edu/ie3/simona/config/RefSystemParser.scala
#	src/main/scala/edu/ie3/simona/config/SimonaConfig.scala
#	src/main/scala/edu/ie3/simona/service/primary/PrimaryServiceProxy.scala
#	src/main/scala/edu/ie3/simona/service/primary/PrimaryServiceWorker.scala
#	src/main/scala/edu/ie3/simona/service/weather/WeatherSourceWrapper.scala
#	src/main/scala/edu/ie3/simona/sim/setup/ExtSimLoader.scala
#	src/test/scala/edu/ie3/simona/config/ConfigFailFastSpec.scala
#	src/test/scala/edu/ie3/simona/config/RefSystemParserSpec.scala
#	src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySpec.scala

CHANGELOG.md

@@ -5,15 +5,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+### Added
+- Implement SQL source for primary data [#34](https://github.com/ie3-institute/simona/issues/34), [#101](https://github.com/ie3-institute/simona/issues/101)
+
 ### Changed
-- Improving code readability in EvcsAgent by moving FreeLotsRequest to separate methods
 - Re-organizing test resources into their respective packages [#105](https://github.com/ie3-institute/simona/issues/105)
 - BREAKING: Using snapshot version of PSDM
 - Simplified PrimaryServiceProxy due to changes in PSDM [#120](https://github.com/ie3-institute/simona/issues/120)
+- Improved handling of weights and their sum in determination of weather data [#173](https://github.com/ie3-institute/simona/issues/173)
+- Improving code readability in EvcsAgent by moving FreeLotsRequest to separate methods [#19](https://github.com/ie3-institute/simona/issues/19)
+- Sending termination message to external simulation on expected and unexpected shutdowns of SIMONA [#35](https://github.com/ie3-institute/simona/issues/35)
+- Improved implementation of `RefSystemParser` [#212](https://github.com/ie3-institute/simona/issues/212)
+- Removed Gradle task puml2png (Converting Plantuml to png / svg files) since it is no longer needed  [#230](https://github.com/ie3-institute/simona/issues/230)
+- Harmonized configuration of csv parameters [#149](https://github.com/ie3-institute/simona/issues/149)
 
 ### Fixed
 - Location of `vn_simona` test grid (was partially in Berlin and Dortmund)
 - Let `ParticipantAgent` die after failed registration with secondary services (prevents stuck simulation)
+- Fix default resolution of weather source wrapper [#78](https://github.com/ie3-institute/simona/issues/78)
 - Fix power exchange between grids
   - Consolidate request replies for different sub grid gates in one message
   - Await and send responses for distinct pairs of sender reference and target node

build.gradle

@@ -7,10 +7,10 @@ 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.3.0'// code format
+  id 'com.diffplug.spotless' version '6.6.1'// code format
   id 'com.github.onslip.gradle-one-jar' version '1.0.6' // pack a self contained jar
   id "com.github.ben-manes.versions" version '0.42.0'
-  id "de.undercouch.download" version "5.0.2" // downloads plugin
+  id "de.undercouch.download" version "5.1.0" // downloads plugin
   id "kr.motd.sphinx" version "2.10.1" // documentation generation
   id "com.github.johnrengelman.shadow" version "7.1.2" // fat jar
   id "org.sonarqube" version "3.3" // sonarqube
@@ -26,9 +26,11 @@ ext {
 
   scalaVersion = '2.13'
   scalaBinaryVersion = '2.13.8'
-  akkaVersion = '2.6.18'
-  tscfgVersion = '0.9.997'
-  scapegoatVersion = '1.4.12'
+  akkaVersion = '2.6.19'
+  tscfgVersion = '0.9.998'
+  scapegoatVersion = '1.4.14'
+
+  testContainerVersion = '0.40.7'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator // location of script plugins
 }
@@ -103,12 +105,16 @@ dependencies {
   /* testing */
   testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0'
   testImplementation 'org.scalatestplus:mockito-3-4_2.13:3.2.10.0'
-  implementation 'org.mockito:mockito-core:4.4.0' // mocking framework
-  testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.11"
-  testRuntimeClasspath 'com.vladsch.flexmark:flexmark-all:0.64.0'
+  implementation 'org.mockito:mockito-core:4.5.1' // mocking framework
+  testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.12"
+  testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.0' //scalatest html output
   testImplementation group: 'org.pegdown', name: 'pegdown', version: '1.6.0'
   testImplementation "com.typesafe.akka:akka-testkit_${scalaVersion}:${akkaVersion}" // akka testkit
 
+  // testcontainers
+  testImplementation "com.dimafeng:testcontainers-scala-scalatest_${scalaVersion}:${testContainerVersion}"
+  testImplementation "com.dimafeng:testcontainers-scala-postgresql_${scalaVersion}:${testContainerVersion}"
+
   /* --- Scala libs --- */
   /* CORE Scala */
   implementation "org.scala-lang:scala-library:${scalaBinaryVersion}"
@@ -138,7 +144,7 @@ dependencies {
   scalaCompilerPlugin "com.sksamuel.scapegoat:scalac-scapegoat-plugin_${scalaBinaryVersion}:${scapegoatVersion}"
 
   implementation 'org.apache.commons:commons-math3:3.6.1' // apache commons math3
-  implementation 'org.apache.poi:poi-ooxml:5.2.1' // used for FilenameUtils
+  implementation 'org.apache.poi:poi-ooxml:5.2.2' // used for FilenameUtils
   implementation 'javax.measure:unit-api:2.1.3'
   implementation 'tech.units:indriya:2.1.3' // quantities
   implementation 'org.apache.commons:commons-csv:1.9.0'

docs/readthedocs/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= python3 -msphinx
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)