Merge branch 'main' into to/#29-simulation-loop

# Conflicts: # poetry.lock
ie3-institute · Oct 24, 2023 · 722d5da · 722d5da
2 parents 84833c1 + 2ac10ea
commit 722d5da
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 46 deletions.
diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt
@@ -1 +1,2 @@
-myst-parser==0.17.2
+myst-parser==2.0.0
+sphinx-rtd-theme==1.3.0
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ authors = ["ie3"]
 [tool.poetry.dependencies]
 python = "~3.10.4"
 PyYAML = "~6.0"
-pandas = "~2.1.0"
+pandas = "~2.1.1"
 
 [tool.poetry.dev-dependencies]
 pre-commit = "~3.3.3"
@@ -16,7 +16,7 @@ Sphinx = "~7.2.6"
 myst-parser = "~2.0.0"
 sphinx-rtd-theme = "~1.3.0"
 pytest = "~7.4.0"
-black = "~23.7.0"
+black = "~23.10.1"
 flake8 = "~6.1.0"
 isort = "~5.12.0"
 flake8-isort = "~6.0.0"