From 5439d94dd5f39dfb301f19ad68fa6ca4d96b96c7 Mon Sep 17 00:00:00 2001
From: Douglas Raillard <douglas.raillard@arm.com>
Date: Mon, 13 Mar 2023 11:26:16 +0000
Subject: [PATCH] doc: Update readthedocs Sphinx version to 6.1.3

readthedocs uses an old version of sphinx for projects created before
2020:
https://github.com/mgeier/sphinx-last-updated-by-git/issues/1

So force a newer version manually.

Also install missing apt packages for dot and plantuml
---
 .readthedocs.yml         | 4 ++++
 doc/doc_requirements.txt | 2 +-
 setup.py                 | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 65f39b7ff8..d89fbf96f0 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -20,6 +20,10 @@ build:
   os: ubuntu-20.04
   tools:
     python: "3.10"
+  apt_packages:
+    - graphviz
+    - plantuml
+    - pandoc
 
 python:
   install:
diff --git a/doc/doc_requirements.txt b/doc/doc_requirements.txt
index 88ad7b4474..211b0ca1b9 100644
--- a/doc/doc_requirements.txt
+++ b/doc/doc_requirements.txt
@@ -1,5 +1,5 @@
 
-sphinx==3.5.1
+sphinx==6.1.3
 
 # A streamlined version of devmode_requirements.txt for doc building
 -e ./tools/exekall
diff --git a/setup.py b/setup.py
index 222f27a8cf..0f6b8b8eb8 100755
--- a/setup.py
+++ b/setup.py
@@ -77,9 +77,9 @@ def make_console_script(name):
 }
 
 extras_require["doc"] = [
-    "sphinx >= 1.8",
     # Force ReadTheDocs to use a recent version, rather than the defaults used
     # for old projects.
+    "sphinx > 2",
     "sphinx_rtd_theme >= 0.5.2",
     "sphinxcontrib-plantuml",
     "nbsphinx",