diff options
author | Andreas Jaeger <aj@suse.com> | 2017-12-01 09:55:11 +0100 |
---|---|---|
committer | Andreas Jaeger <jaegerandi@gmail.com> | 2017-12-02 17:06:59 +0000 |
commit | 464a948d770f1a1061f830ece3f62d0ca0c44063 (patch) | |
tree | 21f24d545706b9eaff39617f7f3b34b03f0f25ba /tox.ini | |
parent | 42a4d1c696936d997d16b33cbddb541816eb9ef2 (diff) | |
download | oslo-utils-464a948d770f1a1061f830ece3f62d0ca0c44063.tar.gz |
Avoid tox_install.sh for constraints support3.32.0
We do not need tox_install.sh, pip can handle constraints itself
and install the project correctly. Thus update tox.ini and remove
the now obsolete tools/tox_install.sh file.
This follows https://review.openstack.org/#/c/508061 to remove
tools/tox_install.sh.
Change-Id: I0acb957501680b85919ca1672a5d8ad751eac5da
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -3,16 +3,14 @@ minversion = 2.0 envlist = py35,py27,pep8 [testenv] -setenv = - VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=oslo.utils -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} -deps = -r{toxinidir}/test-requirements.txt +install_command = pip install {opts} {packages} +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 = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] -deps=-r{toxinidir}/test-requirements.txt commands = flake8 # Run security linter @@ -28,7 +26,6 @@ commands = python setup.py build_sphinx commands = python setup.py test --coverage --coverage-package-name=oslo_utils --testr-args='{posargs}' [testenv:bandit] -deps=-r{toxinidir}/test-requirements.txt commands = bandit -r oslo_utils -x tests -n5 [flake8] |