summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-24 18:53:53 +0200
committerAric Gardner <agardner@linuxfoundation.org>2018-09-26 18:09:35 +0000
commit28fefff6cbc27328fee0f0c570af6d70db39046b (patch)
tree9484ac96ada3c3c6404b5fcc4dd58a54b495f8ba
parent713db16b3d8d041408e7991f6df72ce37879f6bc (diff)
Update conf.py template, remove duplicate submod
- add linter whitelist for unused includes in conf.py template; - remove duplicate git module entry; Change-Id: I88b7cd77a09ed7f4c19b4c277e5642185e830e0b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--.gitmodules3
-rw-r--r--docs/how-to-use-docs/files/conf.py2
-rw-r--r--docs/how-to-use-docs/local-build-transition.rst2
3 files changed, 2 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index f0511b58a..063fc1b60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -238,9 +238,6 @@
url = https://gerrit.opnfv.org/gerrit/calipso
branch = .
ignore = dirty
-[submodule "docs/submodules/stor4nfv"]
- path = docs/submodules/stor4nfv
- url = https://gerrit.opnfv.org/gerrit/stor4nfv
[submodule "docs/submodules/clover"]
path = docs/submodules/clover
url = https://gerrit.opnfv.org/gerrit/clover
diff --git a/docs/how-to-use-docs/files/conf.py b/docs/how-to-use-docs/files/conf.py
index 3c4453e71..eb12e74b6 100644
--- a/docs/how-to-use-docs/files/conf.py
+++ b/docs/how-to-use-docs/files/conf.py
@@ -1 +1 @@
-from docs_conf.conf import *
+from docs_conf.conf import * # noqa: F401,F403
diff --git a/docs/how-to-use-docs/local-build-transition.rst b/docs/how-to-use-docs/local-build-transition.rst
index 5d2c806d7..147cb271c 100644
--- a/docs/how-to-use-docs/local-build-transition.rst
+++ b/docs/how-to-use-docs/local-build-transition.rst
@@ -49,7 +49,7 @@ In your project repo:
.. literalinclude:: files/tox.ini
- *.gitignore*::
+ *.gitignore*
.tox/
docs/_build/*