From 77162eaae2556eb770f1e64b6b1fc1f9d811efa5 Mon Sep 17 00:00:00 2001
From: leufen1 <l.leufen@fz-juelich.de>
Date: Mon, 21 Sep 2020 14:53:57 +0200
Subject: [PATCH] include changelog in docs now working
---
docs/_source/changelog.rst | 2 +-
docs/_source/conf.py | 3 ++-
docs/requirements_docs.txt | 3 ++-
mlair/data_handler/station_preparation.py | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docs/_source/changelog.rst b/docs/_source/changelog.rst
index 2b0ff367..76a914d9 100644
--- a/docs/_source/changelog.rst
+++ b/docs/_source/changelog.rst
@@ -1,4 +1,4 @@
Changelog
=========
-.. include:: ../../CHANGELOG.md
\ No newline at end of file
+.. mdinclude:: ../../CHANGELOG.md
\ No newline at end of file
diff --git a/docs/_source/conf.py b/docs/_source/conf.py
index d4c71e69..c293f0b4 100644
--- a/docs/_source/conf.py
+++ b/docs/_source/conf.py
@@ -46,9 +46,10 @@ extensions = [
'sphinx.ext.napoleon',
'sphinx_rtd_theme',
'sphinx.ext.githubpages',
- 'recommonmark',
+ #'recommonmark',
'sphinx.ext.autosectionlabel',
'sphinx_autodoc_typehints', # must be loaded after napoleon
+ 'm2r2'
]
# 2020-02-19 Begin
diff --git a/docs/requirements_docs.txt b/docs/requirements_docs.txt
index a1294e31..a39acca8 100644
--- a/docs/requirements_docs.txt
+++ b/docs/requirements_docs.txt
@@ -2,4 +2,5 @@ sphinx==3.0.3
sphinx-autoapi==1.3.0
sphinx-autodoc-typehints==1.10.3
sphinx-rtd-theme==0.4.3
-recommonmark==0.6.0
\ No newline at end of file
+#recommonmark==0.6.0
+m2r2==0.2.5
\ No newline at end of file
diff --git a/mlair/data_handler/station_preparation.py b/mlair/data_handler/station_preparation.py
index 6112e7c5..f3428e91 100644
--- a/mlair/data_handler/station_preparation.py
+++ b/mlair/data_handler/station_preparation.py
@@ -76,7 +76,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
# internal
self.data = None
self.meta = None
- self.variables = statistics_per_var.keys() if variables is None else variables
+ self.variables = list(statistics_per_var.keys()) if variables is None else variables
self.history = None
self.label = None
self.observation = None
--
GitLab