diff options
| author | Lance Bragstad <lbragstad@gmail.com> | 2018-08-31 15:22:25 +0000 |
|---|---|---|
| committer | Tony Breeds <tony@bakeyournoodle.com> | 2018-09-07 13:26:57 +1000 |
| commit | 9a6875d479c22b81b47f545253f674a8c6221331 (patch) | |
| tree | f0b097fc145181b3df88316fa302c175b69a5c9f /tox.ini | |
| parent | 631964c51a668b4b160ca724fd8e03b071e8db44 (diff) | |
| download | keystonemiddleware-9a6875d479c22b81b47f545253f674a8c6221331.tar.gz | |
Remove tox_install.sh
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
keystonemiddleware conflicts with the installation of itself.
Change-Id: I8dbb31d1c1fda6df386f456dcf1d8bbed6d168ce
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -5,18 +5,16 @@ envlist = py35,py27,pep8,releasenotes [testenv] usedevelop = True -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} setenv = VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=keystonemiddleware OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 TESTS_DIR=./keystonemiddleware/tests/unit/ -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt - .[audit_notifications] +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} [testenv:pep8] @@ -89,4 +87,3 @@ deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt - .[audit_notifications] |