From dce41dd2f5aa20f3e5d89cbb831361ad715128bc Mon Sep 17 00:00:00 2001 From: tengqm Date: Thu, 11 Aug 2016 21:25:57 -0400 Subject: [PATCH] Use constraints in tox.ini As per email [1] from Andreas, we can add upper constraints on packages used now. [1] http://openstack.markmail.org/thread/a4l7tokbotwqvuoh Change-Id: Iaaacbac9d931a9deb3cfb53afaa4d1c16e84508e --- tox.ini | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index 11ce1470f..258d53620 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt usedevelop = True -install_command = pip install {opts} {packages} +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} commands = find . -type f -name "*.pyc" -delete ostestr --slowest {posargs} @@ -79,9 +79,8 @@ commands = {toxinidir}/tools/cover.sh {posargs} deps = -r{toxinidir}/test-requirements.txt sphinxcontrib-httpdomain commands = - rm -rf doc/build api-ref/build + rm -rf doc/build python setup.py build_sphinx - sphinx-build -W -b html api-ref/source api-ref/build/html whitelist_externals = rm @@ -89,9 +88,6 @@ whitelist_externals = rm commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:api-ref] -# options below are needed by CI scripts for test and publish -# the install_command can be dropped when upstream infra supports constraints -install_command = pip install -U --force-reinstall {opts} {packages} commands = sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html