From e9c5af27a31e2bded864035c7f8bfbaba48e0311 Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Sun, 7 May 2023 14:10:18 +0100 Subject: [PATCH 1/9] bump python version and add setuptools, myst-parser --- .readthedocs.yml | 6 +++++- doc/requirements.txt | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 3d7a86b2..c74e12a2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -4,8 +4,12 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.11" + python: - version: 3.8 install: - requirements: doc/requirements.txt system_packages: true diff --git a/doc/requirements.txt b/doc/requirements.txt index d5c71da9..2f08b8d9 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,9 +2,11 @@ # # SPDX-License-Identifier: CC0-1.0 +setuptools sphinx sphinx_book_theme sphinxcontrib-bibtex +myst-parser # recommark is deprecated, https://stackoverflow.com/a/71660856/13573820 pypsa vresutils>=0.3.1 From 510e544a4fd9350671eead4df41ae9d39abc9758 Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Sun, 7 May 2023 14:19:37 +0100 Subject: [PATCH 2/9] add release note --- doc/release_notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 9be10a4a..8e6bfdd4 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -17,7 +17,7 @@ Upcoming Release * Renamed script file from PyPSA-EUR ``build_load_data`` to ``build_electricity_demand`` and ``retrieve_load_data`` to ``retrieve_electricity_demand``. - +* Fix docs readthedocs built * Add plain hydrogen turbine as additional re-electrification option besides hydrogen fuel cell. Add switches for both re-electrification options under From 8a42ff77ad9e37f55eba2252e0e942902f5be08c Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Sun, 7 May 2023 14:24:58 +0100 Subject: [PATCH 3/9] add myst_parser to conf.py --- doc/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/conf.py b/doc/conf.py index 4b3978af..8111c86c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -36,6 +36,7 @@ sys.path.insert(0, os.path.abspath("../scripts")) extensions = [ #'sphinx.ext.autodoc', #'sphinx.ext.autosummary', + "myst_parser", "sphinx.ext.autosectionlabel", "sphinx.ext.intersphinx", "sphinx.ext.todo", From e62d947fb850686440bb2f55df74d994a854e35d Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Sun, 7 May 2023 14:29:27 +0100 Subject: [PATCH 4/9] set system_packages false --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index c74e12a2..35eff5de 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -12,4 +12,4 @@ build: python: install: - requirements: doc/requirements.txt - system_packages: true + system_packages: false From 5bfa6237e8eaacad41ed9004dda86f4b1651afb4 Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Sun, 7 May 2023 15:44:33 +0100 Subject: [PATCH 5/9] add graphviz --- .readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 35eff5de..b5dc5eba 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,8 +8,11 @@ build: os: ubuntu-22.04 tools: python: "3.11" + apt_packages: + - graphviz python: install: - requirements: doc/requirements.txt system_packages: false + apt_packages: From e18b188e81f64656b45232da8ec15c9954ef2281 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 7 May 2023 14:44:54 +0000 Subject: [PATCH 6/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index b5dc5eba..0ee32009 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,7 +9,7 @@ build: tools: python: "3.11" apt_packages: - - graphviz + - graphviz python: install: From dad04a64a1db152813c11ec02dd30c4b03747e1d Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Sun, 7 May 2023 15:57:42 +0100 Subject: [PATCH 7/9] Update .readthedocs.yml --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 0ee32009..b5dc5eba 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,7 +9,7 @@ build: tools: python: "3.11" apt_packages: - - graphviz + - graphviz python: install: From c431cf6f44a221dc6e7971d4977a1575c6d16867 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 7 May 2023 14:57:56 +0000 Subject: [PATCH 8/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index b5dc5eba..0ee32009 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,7 +9,7 @@ build: tools: python: "3.11" apt_packages: - - graphviz + - graphviz python: install: From 702bb59a18ade47321440112ead6598bb0e4a0d2 Mon Sep 17 00:00:00 2001 From: Max Parzen Date: Sun, 7 May 2023 16:06:33 +0100 Subject: [PATCH 9/9] fix artefact --- .readthedocs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 0ee32009..900dba1e 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -15,4 +15,3 @@ python: install: - requirements: doc/requirements.txt system_packages: false - apt_packages: