From 6cc9f33df3a6e6767f3c4c1a4619b8910586a042 Mon Sep 17 00:00:00 2001 From: RenovateBot Date: Sun, 20 Mar 2022 14:20:32 +0000 Subject: [PATCH 01/12] Pin dependencies (stable) --- docs/poetry.lock | 2 +- docs/pyproject.toml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/poetry.lock b/docs/poetry.lock index 908b6e7ef..bab739919 100644 --- a/docs/poetry.lock +++ b/docs/poetry.lock @@ -471,7 +471,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "1ed2adc007d79bbb463dbf3387f618905bf51b2357d8699359cc69f9c93a7b40" +content-hash = "494b7b89250425af2d67c6a998ff94ee77c0487e6ed6475fc303b20d3ba9a9af" [metadata.files] alabaster = [ diff --git a/docs/pyproject.toml b/docs/pyproject.toml index 2ae464a0d..e02dc82bf 100644 --- a/docs/pyproject.toml +++ b/docs/pyproject.toml @@ -7,13 +7,13 @@ license = "AGPLv3" [tool.poetry.dependencies] python = "^3.10" -Sphinx = "^4.4.0" -sphinx-rtd-theme = "^1.0.0" -django-environ = "^0.8.1" -Django = "^4.0.3" -myst-parser = "^0.17.0" -sphinx-panels = "^0.6.0" -sphinx-multiversion = "^0.2.4" +Sphinx = "4.4.0" +sphinx-rtd-theme = "1.0.0" +django-environ = "0.8.1" +Django = "4.0.3" +myst-parser = "0.17.0" +sphinx-panels = "0.6.0" +sphinx-multiversion = "0.2.4" [tool.poetry.dev-dependencies] From a3c49f57b7f687c6e14a26599a8072eb55fb3b6e Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Mon, 21 Mar 2022 12:01:29 +0100 Subject: [PATCH 02/12] 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 From 767a82b1c41cf7d21f73c6cff52c90d410939f8b Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Mon, 21 Mar 2022 12:12:36 +0100 Subject: [PATCH 03/12] Pull latest commits before generating docs --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9edc8da60..678565929 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,9 +78,9 @@ review_docs: - apt-get install -y graphviz git - pip install poetry - poetry install - - git switch develop - - git switch stable - - git switch $CI_COMMIT_BRANCH + - git switch develop && git pull + - git switch stable && git pull + - git switch $CI_COMMIT_BRANCH && git pull script: - poetry run python -m sphinx . $BUILD_PATH cache: @@ -251,9 +251,9 @@ pages: - apt-get install -y graphviz git - pip install poetry - poetry install - - git switch develop - - git switch stable - - git switch $CI_COMMIT_BRANCH + - git switch develop && git pull + - git switch stable && git pull + - git switch $CI_COMMIT_BRANCH && git pull script: - ./build_docs.sh cache: From fc8487bfed68b0b0a144d7a68421a374258829af Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 18 Mar 2022 17:32:39 +0100 Subject: [PATCH 04/12] Fix frontend formatting --- front/src/components/playlists/Editor.vue | 2 +- front/src/store/radios.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/components/playlists/Editor.vue b/front/src/components/playlists/Editor.vue index d60670575..29b2e3793 100644 --- a/front/src/components/playlists/Editor.vue +++ b/front/src/components/playlists/Editor.vue @@ -157,7 +157,7 @@ {{ plt.track.artist.name }} -