summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYUANHONG DENG <dengyuanhong@chinamobile.com>2021-02-02 01:45:05 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-02 01:45:05 +0000
commit431d3e2cae18d5465ee39972d05d045aae73a785 (patch)
treebf9790191d40e85914ada624479ab8fef0d75d06
parent61d2625d8d83cc0439d6fca6d63b2049b61844fc (diff)
parent17907a82a2932a05b4a722baedc8a0710e118335 (diff)
Merge "Add missing conf.py import"
-rw-r--r--docs/conf.py2
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 072d330..8c226ba 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,3 +1,5 @@
+from docs_conf.conf import *
+
branch = 'latest'
master_doc = 'index'
diff --git a/tox.ini b/tox.ini
index 9332176..506c297 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ downloadcache = ~/cache/pip
[flake8]
ignore = E501,E722
-exclude = ./venv-tox,./.tox,./venv
+exclude = ./venv-tox,./.tox,./venv,./docs
[testenv]
deps = -r{toxinidir}/requirements.txt