Skip to content
Permalink
Browse files

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: Iffcd4035b0d0a7765db9c6dfba1c9dff68076082
  • Loading branch information...
ajaeger committed Dec 2, 2017
1 parent ad69829 commit 959204ce38e53a3ca1071858be14a8f4a5270f00
Showing with 7 additions and 37 deletions.
  1. +0 −30 tools/tox_install.sh
  2. +7 −7 tox.ini

This file was deleted.

14 tox.ini
@@ -4,20 +4,21 @@ minversion = 2.0
skipsdist = True

[testenv]
setenv = VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=python-searchlightclient
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}
deps = -r{toxinidir}/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}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
find . -type f -name "*.pyc" -delete
python setup.py testr --slowest --testr-args='{posargs}'
whitelist_externals = find

[testenv:pypy]
deps = setuptools<3.2
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
setuptools<3.2
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt

@@ -30,7 +31,6 @@ commands = {posargs}

[testenv:functional]
setenv =
{[testenv]setenv}
OS_TEST_PATH = ./searchlightclient/tests/functional
passenv = OS_*

0 comments on commit 959204c

Please sign in to comment.
You can’t perform that action at this time.