From f3b2ee250f545720553d86cdb6e4bea6b73d9098 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 27 Mar 2017 11:19:25 +0100 Subject: [PATCH] tox: Stop calling config/policy generators twice 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 --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tox.ini b/tox.ini index bb1c961bc..93ba36de3 100644 --- a/tox.ini +++ b/tox.ini @@ -124,10 +124,6 @@ commands = bash -c "! find doc/ -type f -name *.json | xargs grep -U -n $'\r'" # 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' - 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-ref/source api-ref/build/html sphinx-build -W -b html placement-api-ref/source placement-api-ref/build/html