openstack/python-troveclient
Code Issues Proposed changes

Fixing sphinx docs.

Browse Source 
Added the docs testenv back, which I hope won't break stackforge
CI. Updated the run_local.sh script since it was also broken.

Change-Id: I87245ab123b03aefb283eba184304312bd18c228
Fixes: bug #1119748
This commit is contained in:
Tim Simpson
2013-02-08 14:50:44 -06:00
parent 36c99c3a4d
commit 82df686dfb
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
run_local.sh
View File

@@ -31,10 +31,14 @@ fi
reddwarf_path=$1 reddwarf_path=$1
reddwarf_pid_file="`pwd`.pid" reddwarf_pid_file="`pwd`.pid"
# the funmaker
function start_server() { function start_server() {
server_log=`pwd`/rdserver.txt
set +e
rm $server_log
set -e
pushd $reddwarf_path pushd $reddwarf_path
bin/start_server.sh --pid_file=$reddwarf_pid_file bin/start_server.sh --pid-file=$reddwarf_pid_file \
--override-logfile=$server_log
popd popd
} }
@@ -57,7 +61,10 @@ function on_error() {
trap on_error EXIT # Proceed to trap - END in event of failure. trap on_error EXIT # Proceed to trap - END in event of failure.
start_server start_server
tox tox -edocs
mkdir -p .tox/docs/html
.tox/docs/bin/sphinx-build -b doctest docs/source .tox/docs/html
.tox/docs/bin/sphinx-build -b html docs/source .tox/docs/html
stop_server stop_server

8
tox.ini
View File

@@ -22,3 +22,11 @@ commands = {posargs}
[testenv:cover] [testenv:cover]
commands = nosetests --cover-erase --cover-package=reddwarfclient --with-xcoverage commands = nosetests --cover-erase --cover-package=reddwarfclient --with-xcoverage
[testenv:docs]
-deps =
coverage
httplib2
sphinx
-commands =
sphinx-build -b html {toxinidir}/docs/source {envtmpdir}/html