diff --git a/tools/tox_install.sh b/tools/tox_install.sh index 5f8e7c7c5..3acf392fa 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -19,14 +19,9 @@ neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?) set -e -CONSTRAINTS_FILE=$1 +install_cmd="pip install -c$1" shift -install_cmd="pip install" -if [ $CONSTRAINTS_FILE != "unconstrained" ]; then - install_cmd="$install_cmd -c$CONSTRAINTS_FILE" -fi - if [ $neutron_installed -eq 0 ]; then echo "ALREADY INSTALLED" > /tmp/tox_install.txt echo "Neutron already installed; using existing package" diff --git a/tox.ini b/tox.ini index fef495cba..00cf2a069 100644 --- a/tox.ini +++ b/tox.ini @@ -17,8 +17,6 @@ commands = # mode. To do this define the TRACE_FAILONLY environmental variable. [testenv:releasenotes] -# TODO(ihrachys): remove once infra supports constraints for this target -install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages} commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:pep8] @@ -30,15 +28,11 @@ commands = whitelist_externals = sh [testenv:cover] -# TODO(ihrachys): remove once infra supports constraints for this target -install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages} commands = python setup.py test --coverage --coverage-package-name=neutron_lbaas --testr-args='{posargs}' coverage report [testenv:venv] -# TODO(ihrachys): remove once infra supports constraints for this target -install_command = pip install -U {opts} {packages} commands = {posargs} [testenv:docs]