From a3c49f57b7f687c6e14a26599a8072eb55fb3b6e Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Mon, 21 Mar 2022 12:01:29 +0100 Subject: [PATCH] Fix Multi version docs, closes #1739 --- docs/build_docs.sh | 2 +- docs/conf.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/build_docs.sh b/docs/build_docs.sh index adecf2471..4fb40928f 100755 --- a/docs/build_docs.sh +++ b/docs/build_docs.sh @@ -1,6 +1,6 @@ #!/bin/bash -eux # Building sphinx and swagger docs -poetry run python -m sphinx . $BUILD_PATH # TODO enable multi version #1739 +poetry run sphinx-multiversion . $BUILD_PATH TARGET_PATH="$BUILD_PATH/swagger" ./build_swagger.sh python ./get-releases-json.py > $BUILD_PATH/releases.json python ./get-releases-json.py --latest > $BUILD_PATH/latest.txt diff --git a/docs/conf.py b/docs/conf.py index 7ba31a7b4..a1c3ce39b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -82,9 +82,8 @@ author = "The Funkwhale Collective" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -# -# The short X.Y version. -version = subprocess.check_output(["git", "describe", "--tags"]).strip().decode("utf-8") +# Read version from the API +version = funkwhale_api.__version__ release = version # The language for content autogenerated by Sphinx. Refer to documentation