From e3c8c246e6434d8a3e1ebc4fadcf82047c2f84d4 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 24 Jan 2017 09:42:39 +0000 Subject: [PATCH] Ensure that tox uses global pins The tox implementation currently does not make use of the global pins as requirements or as constraints. This may cause an inconsistent pip, setuptools and wheel package set being installed when executing tests. This patch ensures that the pinned versions are installed when setting up the tox venv, and ensures that the pins are used as constraints in any subsequent package installations. Closes-Bug: #1658773 Change-Id: Id4176f39eeefe3323c35e5f05bca6b208b615088 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a7d7eace8e..37dcf123c0 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,9 @@ envlist = linters,docs,releasenotes usedevelop = True basepython = python2.7 install_command = - pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} + pip install -c{toxinidir}/global-requirement-pins.txt -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} deps = + -r{toxinidir}/global-requirement-pins.txt -r{toxinidir}/test-requirements.txt passenv = HOME