From 621332cf36d80984d3283b13a6830df6fa16e9f7 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 8 Mar 2018 07:57:56 -0600 Subject: Remove tox_install.sh and align constraints consumption As part of removing reliance on the old and deprecated zuul-cloner, we need to shift constraints declaration to the deps line. This means we unfortunately have to duplicate the extras declarations into test-requirements - because otherwise the contraints for oslo.db conflicts with the installation of itself. Change-Id: I2b79444a58a9144993131f9cba7494b236d9e950 --- tox.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 3afe728..6deb9fc 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ minversion = 2.0 envlist = py35,py27,pep8,pip-missing-reqs [testenv] -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install {opts} {packages} whitelist_externals = bash env setenv = @@ -15,10 +15,10 @@ setenv = {postgresql,all}: PIFPAF_POSTGRESQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh - -deps = .[test,fixtures,mysql,postgresql] - {postgresql,mysql,all}: .[pifpaf] - +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt commands = {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} '{posargs}' -- cgit v1.2.1