From b75f52cc7dff354f2b6146ac15d745f42972fe1b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 22 Jun 2023 09:10:05 +0200 Subject: Prepare london doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue-ID: DOC-811 Signed-off-by: Cédric Ollivier Change-Id: I1845238e3449d1c4b82be4d122dc90e157855484 --- .gitreview | 2 +- .readthedocs.yaml | 12 +++++------- docs/conf.py | 8 ++++---- docs/tox.ini | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.gitreview b/.gitreview index 7019809e..37636d35 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.onap.org port=29418 project=ccsdk/apps.git -defaultbranch=master \ No newline at end of file +defaultbranch=london diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 3797dc8b..f56b3b71 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,18 +3,16 @@ # Read the Docs configuration file # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details # Required -version: 2 - -formats: - - htmlzip +version: 2 build: - image: latest + os: ubuntu-20.04 + tools: + python: "3.8" python: - version: 3.7 install: - - requirements: docs/requirements-docs.txt + - requirements: docs/requirements-docs.txt sphinx: configuration: docs/conf.py diff --git a/docs/conf.py b/docs/conf.py index 70937d74..ab16216c 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' @@ -53,4 +53,4 @@ def setup(app): linkcheck_ignore = [ r'http://localhost:\d+/' -] \ No newline at end of file +] diff --git a/docs/tox.ini b/docs/tox.ini index b9d7eb44..c208028f 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 -- cgit 1.2.3-korg