Skip to content

Commit 6d94ae1

Browse files
ajaegerajaeger
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: Ia1ff8e18cd0a9ba82137aa527fc8b6fc1b5e98a5
1 parent bd9bc7d commit 6d94ae1

File tree

2 files changed

+2
-57
lines changed

2 files changed

+2
-57
lines changed

‎tools/tox_install.sh‎

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

‎tox.ini‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ skipsdist = True
55

66
[testenv]
77
usedevelop = True
8-
install_command = {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 {opts} {packages}
99
setenv =
1010
VIRTUAL_ENV={envdir}
1111
NOSE_WITH_OPENSTACK=1
@@ -18,6 +18,7 @@ setenv =
1818
DISCOVER_DIRECTORY=mistralclient/tests/unit
1919
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
2020
deps =
21+
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
2122
-r{toxinidir}/requirements.txt
2223
-r{toxinidir}/test-requirements.txt
2324
commands =

0 commit comments

Comments
 (0)