openstack/horizon
Code Issues Proposed changes

Fix keystone warnings while building docs

Browse Source 
When building the documentation via run_tests.sh, doc/source/conf.py
explicitly sets the DJANGO_SETTINGS_MODULE environment variable,
overriding any existing value that it already has. Furthermore, it sets
it to point to a settings file that does not use keystone v3, which
is expected by the tests (and is the source of the warning).  Note that
when running unit tests via run_tests.sh, a different settings file is
supplied which DOES use keystone v3.

Change the doc/source/conf.py to only set DJANGO_SETTINGS_MODULE if it
is not already set.  Change tox.ini and run_tests.sh to set
DJANGO_SETTINGS_MODULE to the same settings file used by the unit tests,
with keystone v3 support.

Change-Id: Ib297e4188f2426cf575300998bc9d50f36e48f4f
Closes-Bug: #1257725
This commit is contained in:
Gary W. Smith 2014-06-12 17:00:19 -07:00
parent d329ded5ac
commit 1f38f87138
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/conf.py
View File

@ -33,7 +33,7 @@ ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
sys.path.insert(0, ROOT)
# This is required for ReadTheDocs.org, but isn't a bad idea anyway.
os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'openstack_dashboard.settings')
import horizon.version

2
run_tests.sh
View File

@ -158,7 +158,7 @@ function run_pep8 {
function run_sphinx {
echo "Building sphinx..."
${command_wrapper} python setup.py build_sphinx
DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings ${command_wrapper} python setup.py build_sphinx
echo "Build complete."
}

2
tox.ini
View File

@ -45,7 +45,7 @@ basepython = python2.6
commands = /bin/bash run_tests.sh -N --integration {posargs}
[testenv:docs]
setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
setenv = DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings
commands = python setup.py build_sphinx
[tox:jenkins]