Merge branch 'main' into main

pypsa-meets-earth · Jan 14, 2025 · b1ef404 · b1ef404
2 parents 007e427 + 62cab73
commit b1ef404
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -4,6 +4,9 @@
 
 version: 2
 
+sphinx:
+  configuration: doc/conf.py
+
 build:
   os: ubuntu-22.04
   tools:

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -25,6 +25,8 @@ This part of documentation collects descriptive release notes to capture the mai
 
 * Fix overlapping bus regions when alternative clustering is selected `PR #1287 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1287>`__
 
+* Fix readthedocs by explicitly specifying the location of the Sphinx config `PR #1292 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1292>`__
+
 * Fix lossy bidirectional links, especially H2 pipelines, which would sometimes gain H2 instead of losing it.  `PR #1192 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1192>`__
 
 PyPSA-Earth 0.6.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,9 @@ @@
     version: 2
+    sphinx:
+      configuration: doc/conf.py
     build:
       os: ubuntu-22.04
       tools:
@@ Expand Down @@