From d8f21a6bc8155feda9ac884a8790980851bdd339 Mon Sep 17 00:00:00 2001 From: thmsdt Date: Mon, 26 Jun 2023 14:35:32 +0200 Subject: fix docs config files Issue-ID: DOC-811 Signed-off-by: thmsdt Change-Id: Ie7d186adcf74520250bff534de29ba29283f16ca --- .gitreview | 2 +- .readthedocs.yaml | 21 +++++++++------------ docs/conf.py | 6 +++--- docs/tox.ini | 6 +++--- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.gitreview b/.gitreview index bbc52e5..e432379 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.onap.org port=29418 project=holmes/rule-management.git -defaultbranch=master +defaultbranch=london diff --git a/.readthedocs.yaml b/.readthedocs.yaml index a1f1b04..f56b3b7 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,21 +1,18 @@ --- # .readthedocs.yml -# # Read the Docs configuration file -# # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details -# # Required -# -version: 2 +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details +# Required +version: 2 build: - image: latest + os: ubuntu-20.04 + tools: + python: "3.8" python: - version: 3.7 install: - - requirements: docs/requirements-docs.txt - -submodules: - include: all + - requirements: docs/requirements-docs.txt sphinx: - configuration: docs/conf.py \ No newline at end of file + configuration: docs/conf.py diff --git a/docs/conf.py b/docs/conf.py index bf9f0d6..a87cf41 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ project = "onap" -release = "master" -version = "master" +release = "london" +version = "london" author = "Open Network Automation Platform" # yamllint disable-line rule:line-length @@ -30,7 +30,7 @@ extensions = [ # Change to {releasename} after you have created the new 'doc' branch. # -branch = 'latest' +branch = 'london' intersphinx_mapping = {} doc_url = 'https://docs.onap.org/projects' diff --git a/docs/tox.ini b/docs/tox.ini index 44ea131..1538b87 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -8,7 +8,7 @@ basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=london commands = sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html @@ -17,7 +17,7 @@ basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=london commands = sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck @@ -26,6 +26,6 @@ basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=london commands = sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck \ No newline at end of file -- cgit 1.2.3-korg