diff options
| author | Andreas Jaeger <aj@suse.com> | 2017-12-02 09:37:46 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2017-12-02 09:37:46 +0100 |
| commit | 79d872a99a7b4eb5697b126c2549b8750442024f (patch) | |
| tree | 8b40cde16b126745a87dc5a7652f259d922a3e83 /tox.ini | |
| parent | d9839c1fb7376cc3f859284e1158b377fd1cd23e (diff) | |
| download | python-saharaclient-79d872a99a7b4eb5697b126c2549b8750442024f.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: Ibb97ddc7dc3a1c1cd7b4734377188fa625ddef7e
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5,13 +5,12 @@ skipsdist = True [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} +install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=python-saharaclient DISCOVER_DIRECTORY=saharaclient/tests/unit 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 = find . -type f -name "*.pyc" -delete @@ -44,6 +43,7 @@ commands = flake8 [testenv:doc8] 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 doc8 |