aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2023-06-19 11:41:51 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2023-06-19 11:41:51 +0200
commit25cfad31df93dfd5bbcb98834db6d07d1e9d1259 (patch)
tree2937cf5a6ed64ba93d299451a6db96684d3e747f
parente3f81a6028afd09fbaefefbac83fc46c472903c4 (diff)
Fix london doc build configs
Issue-ID: DOC-811 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: I61f46072d87f627400bebfe11da40a93d292b420
-rw-r--r--.gitreview2
-rw-r--r--.readthedocs.yaml12
-rw-r--r--docs/conf.py6
-rw-r--r--docs/tox.ini6
4 files changed, 12 insertions, 14 deletions
diff --git a/.gitreview b/.gitreview
index dc16e5b11..3864a7cb3 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
host=gerrit.onap.org
port=29418
project=ccsdk/cds.git
-defaultbranch=master
+defaultbranch=london
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 3797dc8bb..f56b3b71f 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 27c418493..d1b20502b 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
@@ -31,7 +31,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 94fd5ba63..917222ae2 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 -q -W -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
@@ -17,7 +17,7 @@ commands =
#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 -q -W -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 -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck