Merge "Add missing conf.py import"

diff --git a/docs/conf.py b/docs/conf.py
index 072d330..8c226ba 100644 (file)
--- 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 (file)
--- 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