RTD Doc Fixes as done in Master branch

Cherry picking gave problems merged all changes into this patch instead

Issue-ID: CPS-754

Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Iae542c56b4657144f95a77588e6659b29aa5a575

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644 (file)
index 0000000..9c22c0b
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,38 @@
+#  ============LICENSE_START=======================================================
+#  Copyright (C) 2021 Nordix Foundation
+#  ================================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#  ============LICENSE_END=========================================================
+
+---
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+# Required
+version: 2
+
+formats:
+  - htmlzip
+
+build:
+  image: latest
+
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements-docs.txt
+
+sphinx:
+  configuration: docs/conf.py

diff --git a/requirements.txt b/docs/requirements-docs.txt
similarity index 100%
rename from requirements.txt
rename to docs/requirements-docs.txt

diff --git a/tox.ini b/docs/tox.ini
similarity index 86%
rename from tox.ini
rename to docs/tox.ini
index 0087c8c..55d6f09 100644 (file)
--- a/tox.ini
+++ b/docs/tox.ini
@@ -23,12 +23,12 @@ skipsdist = true
 
 [testenv:docs]
 basepython = python3
-deps = -r{toxinidir}/requirements.txt
+deps = -r{toxinidir}/requirements-docs.txt
        -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt?h=istanbul
        -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=istanbul
 commands =
-    sphinx-build -b html -n -d {envtmpdir}/docs/doctrees ./docs {toxinidir}/docs/_build/html
-    echo "Generated docs available in {toxinidir}/docs/_build/html"
+    sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
+    echo "Generated docs available in {toxinidir}/_build/html"
 whitelist_externals =
     echo
     git
@@ -36,7 +36,7 @@ whitelist_externals =
 
 [testenv:docs-linkcheck]
 basepython = python3
-deps = -r{toxinidir}/requirements.txt
+deps = -r{toxinidir}/requirements-docs.txt
        -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt?h=istanbul
        -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=istanbul
 commands = echo "Link Checking not enforced"