openstack/nova
Code Issues Proposed changes

tox: Stop calling config/policy generators twice

Browse Source 
oslo.config and oslo.policy provide Sphinx integrations for building and
showing sample config and policy files, respectively. These integrations
are registered as hooks that will fire when the builder is initialized
[1][2]. As a result, these commands do not need to be manually called.
Stop doing so.

[1] https://github.com/openstack/oslo.config/blob/3.23.0/oslo_config/sphinxconfiggen.py#L89
[2] https://github.com/openstack/oslo.policy/blob/1.21.0/oslo_policy/sphinxpolicygen.py#L73

Change-Id: I6c18b06c92370d28226f2814a3c094e60985cb83
This commit is contained in:
Stephen Finucane
2017-03-27 11:19:25 +01:00
parent b96c8ab96f
commit 4e2441d2ff
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tox.ini
View File

@@ -124,10 +124,6 @@ commands =
bash -c "! find doc/ -type f -name *.json | xargs grep -U -n $'\r'" bash -c "! find doc/ -type f -name *.json | xargs grep -U -n $'\r'"
# Check that all included JSON files are valid JSON # Check that all included JSON files are valid JSON
bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python' bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
oslo-config-generator --config-file=etc/nova/nova-config-generator.conf
oslopolicy-sample-generator --config-file=etc/nova/nova-policy-generator.conf
oslopolicy-list-redundant --namespace nova
oslopolicy-policy-generator --namespace nova --output-file etc/nova/policy.yaml.merged
sphinx-build -W -b html api-guide/source api-guide/build/html sphinx-build -W -b html api-guide/source api-guide/build/html
sphinx-build -W -b html api-ref/source api-ref/build/html sphinx-build -W -b html api-ref/source api-ref/build/html
sphinx-build -W -b html placement-api-ref/source placement-api-ref/build/html sphinx-build -W -b html placement-api-ref/source placement-api-ref/build/html