summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2017-12-01 08:08:56 +0100
committerAndreas Jaeger <aj@suse.com>2017-12-01 08:08:56 +0100
commit7071b0f3922153b37f509bf6758c84db2a9fd4bc (patch)
treed29a41116fc9511e5cc65030a7ff2585eeabdb98 /tox.ini
parentaee63832f6bfb01086b15fe16a773bb4175655e6 (diff)
downloadoslo-config-7071b0f3922153b37f509bf6758c84db2a9fd4bc.tar.gz
Avoid tox_install.sh for constraints support
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: I7a266b2209097ff2db0e43076c0e8621cfece5f1
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini12
1 files changed, 5 insertions, 7 deletions
diff --git a/tox.ini b/tox.ini
index a28373f..0f3e392 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,12 +4,11 @@ distribute = False
envlist = py35,py27,pep8
[testenv]
-setenv =
- VIRTUAL_ENV={envdir}
- BRANCH_NAME=master
- CLIENT_NAME=oslo.config
-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 -U {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 test --coverage --coverage-package-name=oslo_config --slowest --testr-args='{posargs}'
coverage report --show-missing
@@ -32,7 +31,6 @@ commands = {posargs}
commands = python setup.py build_sphinx
[testenv:bandit]
-deps = -r{toxinidir}/test-requirements.txt
commands = bandit -r oslo_config -x tests -n5
[flake8]