From 0124bf49191b629f9248df0391582265f6f01b68 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 17 Apr 2018 16:45:10 -0400 Subject: stop using tox_install.sh Duplicate the dependencies that are listed in extras and place them in a test-requirements.txt file so we can install them using the constraints list. In order to add the new requirements file, we have to make the constraints and requirements match each other and the global settings. Change-Id: I4dae402fe37015f0f512d5e9a6426d5f39526347 Signed-off-by: Doug Hellmann --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index b3d544a..9ae3a7e 100644 --- a/tox.ini +++ b/tox.ini @@ -16,11 +16,12 @@ setenv = VIRTUAL_ENV={envdir} BRANCH_NAME=master CLIENT_NAME=taskflow -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} # We need to install a bit more than just `test' because those drivers have # custom tests that we always run deps = - .[test,workers,zookeeper,database,redis,eventlet] + -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 = python setup.py testr --slowest --testr-args='{posargs}' -- cgit v1.2.1