Skip to content

Commit 8b32b53

Browse files
committed
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: Ie7c06ead39c8597ec9326f223625d1fa0d5208d1
1 parent 01d3b42 commit 8b32b53

2 files changed

Lines changed: 5 additions & 66 deletions

File tree

tools/tox_install.sh

Lines changed: 0 additions & 55 deletions
This file was deleted.

tox.ini

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ skipdist = True
55

66
[testenv]
77
usedevelop = True
8-
install_command =
9-
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
8+
install_command = pip install -U {opts} {packages}
109
setenv = VIRTUAL_ENV={envdir}
1110
OS_STDOUT_CAPTURE=1
1211
OS_STDERR_CAPTURE=1
1312
OS_TEST_TIMEOUT=60
14-
deps = -r{toxinidir}/test-requirements.txt
13+
deps =
14+
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
15+
-r{toxinidir}/test-requirements.txt
16+
-r{toxinidir}/requirements.txt
1517
commands = ostestr {posargs}
1618
whitelist_externals = ostestr
1719

@@ -54,14 +56,6 @@ commands =
5456
bandit -r openstackclient -x tests -s B105,B106,B107,B401,B404,B603,B606,B607,B110,B605,B101
5557

5658
[testenv:unit-tips]
57-
usedevelop = True
58-
install_command =
59-
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
60-
setenv = VIRTUAL_ENV={envdir}
61-
OS_STDOUT_CAPTURE=1
62-
OS_STDERR_CAPTURE=1
63-
OS_TEST_TIMEOUT=60
64-
deps = -r{toxinidir}/test-requirements.txt
6559
commands =
6660
pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
6761
pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"

0 commit comments

Comments
 (0)