From e27e7ed4a9452eb69f6c1af434adb5620706c227 Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Thu, 31 Mar 2016 11:42:27 -0700 Subject: [PATCH] Make tox respect upper-constraints.txt This will force pip install to use the upper-constraints.txt specified version of pip modules. When you don't do this, you are out on the bleeding edge and become unstable everytime some python library in the wide world changes in a way that you don't expect. Post jobs are not yet compatible with the upper-constraints file, so override the install_command there to skip upper-constraints. Blatantly cribbed from the equivalent trove patch: https://review.openstack.org/#/c/298850 Change-Id: I73aa8cf37adc36db2c56a8f29ea165775a83dc7f Closes-Bug: #1563038 --- tox.ini | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index b74caf5f2d..292dbc2078 100644 --- a/tox.ini +++ b/tox.ini @@ -5,9 +5,7 @@ envlist = py34,py27,pep8 [testenv] usedevelop = True -install_command = - constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} - pip install -U {opts} {packages} +install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} setenv = VIRTUAL_ENV={envdir} PYTHONDONTWRITEBYTECODE = 1 LANGUAGE=en_US @@ -37,6 +35,12 @@ commands = [testenv:cover] setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US +# NOTE(amrith) The setting of the install_command in this location +# is only required because currently infra does not actually +# support constraints files for the cover job, and while +# the environment variable UPPER_CONSTRAINTS_FILE is set, there's +# no file there. It can be removed when infra changes this. +install_command = pip install -U {opts} {packages} commands = python setup.py testr --coverage {posargs} @@ -61,10 +65,22 @@ commands = python setup.py build_sphinx [testenv:releasenotes] +# NOTE(amrith) The setting of the install_command in this location +# is only required because currently infra does not actually +# support constraints files for the releasenotes job, and while +# the environment variable UPPER_CONSTRAINTS_FILE is set, there's +# no file there. It can be removed when infra changes this. +install_command = pip install -U {opts} {packages} commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:venv] setenv = PYTHONHASHSEED=0 +# NOTE(amrith) The setting of the install_command in this location +# is only required because currently infra does not actually +# support constraints files for the docs job, and while +# the environment variable UPPER_CONSTRAINTS_FILE is set, there's +# no file there. It can be removed when infra changes this. +install_command = pip install -U {opts} {packages} commands = {posargs} [flake8]