Fix tox.ini for both tox 1.6 and 1.7
The current way fails to work with tox 1.6 when building the translated manuals. Fix so that it now really works with both tox 1.6 and 1.7. Note that this is a workaround for a bug in tox 1.7. Change-Id: Ib1cf8ccfc162fe313b9f2be35b78f5004634f97b
This commit is contained in:
parent
fe66f0d497
commit
1547ca93ed
6
tools/copy_pom
Executable file
6
tools/copy_pom
Executable file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
TARGET=$1
|
||||||
|
|
||||||
|
echo "copying pom.xml for $TARGET"
|
||||||
|
cp doc/pom.xml generated/$TARGET/pom.xml
|
3
tox.ini
3
tox.ini
@ -35,6 +35,7 @@ commands = openstack-doc-test --check-build --nocreate-index --force
|
|||||||
# in the venv. Since it's installed in the system, let's
|
# in the venv. Since it's installed in the system, let's
|
||||||
# use sitepackages.
|
# use sitepackages.
|
||||||
sitepackages=True
|
sitepackages=True
|
||||||
|
whitelist_externals = bash
|
||||||
commands =
|
commands =
|
||||||
openstack-generate-docbook -l {posargs} -b common
|
openstack-generate-docbook -l {posargs} -b common
|
||||||
openstack-generate-docbook -l {posargs} -b glossary
|
openstack-generate-docbook -l {posargs} -b glossary
|
||||||
@ -43,5 +44,5 @@ commands =
|
|||||||
# tox 1.7 does not parse the following line:
|
# tox 1.7 does not parse the following line:
|
||||||
# cp doc/pom.xml generated/{posargs}/pom.xml
|
# cp doc/pom.xml generated/{posargs}/pom.xml
|
||||||
# Thus replaced by the next one:
|
# Thus replaced by the next one:
|
||||||
cd generated; cd {posargs} ; cp ../doc/pom.xml .
|
bash ./tools/copy_pom {posargs}
|
||||||
openstack-doc-test --check-build -l {posargs} --only-book install-guide --nocreate-index
|
openstack-doc-test --check-build -l {posargs} --only-book install-guide --nocreate-index
|
||||||
|
Loading…
Reference in New Issue
Block a user