From 2cbb73f8620da1c76f36ca316581125759474bd8 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Tue, 25 Jun 2019 13:20:35 -0400 Subject: [PATCH] Update tox.ini files to use stein constraints This updates the upper-constraints.txt used by tox for installing python modules to reference the stable/stein constraints. Change-Id: I337321543b6f778721a656c575a26854a20ff5d5 Partial-Bug: 1834216 Signed-off-by: Don Penney --- .gitignore | 1 + inventory/inventory/tox.ini | 5 ++++- python-inventoryclient/inventoryclient/tox.ini | 5 ++++- tox.ini | 4 +++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c946a099..e7f3ca59 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ ChangeLog _build build cover +coverage.xml develop-eggs dist eggs diff --git a/inventory/inventory/tox.ini b/inventory/inventory/tox.ini index 988a0c99..4a0993f3 100644 --- a/inventory/inventory/tox.ini +++ b/inventory/inventory/tox.ini @@ -11,7 +11,10 @@ distshare={toxworkdir}/.tox/distshare [testenv] # sitepackages = True -install_command = pip install -v -v -v -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} +install_command = pip install \ + -v -v -v \ + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \ + {opts} {packages} whitelist_externals = bash find setenv = diff --git a/python-inventoryclient/inventoryclient/tox.ini b/python-inventoryclient/inventoryclient/tox.ini index 3891da95..07b5c285 100644 --- a/python-inventoryclient/inventoryclient/tox.ini +++ b/python-inventoryclient/inventoryclient/tox.ini @@ -15,7 +15,10 @@ setenv = VIRTUAL_ENV={envdir} basepython = python2.7 usedevelop = True -install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} +install_command = pip install \ + -U \ + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \ + {opts} {packages} deps = -r{toxinidir}/test-requirements.txt commands = diff --git a/tox.ini b/tox.ini index 549a2733..a4249623 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,9 @@ minversion = 2.3 skipsdist = True [testenv] -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages} +install_command = pip install \ + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \ + {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1