From db5cc667ee858384b7db1a031a1244993bee7876 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Mon, 1 Apr 2019 14:32:23 +0100
Subject: [PATCH] tox: Change default 'install_command'

Means we don't need to set this for the default factors (py3x), meaning
we get new versions for free going forward.

Change-Id: Idba181e96adab16181a7f776093c9dfe33e071c6
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 tox.ini | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/tox.ini b/tox.ini
index 65665f9cf3..c5fb1e4b40 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
+install_command = bash tools/pip.sh {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_TEST_TIMEOUT=240
          OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:1}
@@ -21,34 +22,23 @@ passenv = ZUUL_TEST_ROOT
           ZUUL_MYSQL_HOST
           ZUUL_POSTGRES_HOST
 usedevelop = True
-install_command = pip install {opts} {packages}
 whitelist_externals = bash
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
            stestr slowest
 
-[nodeenv]
-install_command = bash tools/pip.sh {opts} {packages}
-
-[testenv:py35]
-install_command = {[nodeenv]install_command}
-
-[testenv:py36]
-install_command = {[nodeenv]install_command}
-
-[testenv:py37]
-install_command = {[nodeenv]install_command}
-
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if
 # system dependencies are missing, since it's used to tell you what system
 # dependencies are missing! This also means that bindep must be installed
 # separately, outside of the requirements files.
+install_command = pip install {opts} {packages}
 deps = bindep
 commands = bindep test
 
 [testenv:pep8]
+install_command = pip install {opts} {packages}
 # --ignore-missing-imports tells mypy to not try to follow imported modules
 # out of the current tree. As you might expect, we don't want to run static
 # type checking on the world - just on ourselves.
@@ -57,7 +47,7 @@ commands =
   mypy --ignore-missing-imports zuul
 
 [testenv:cover]
-install_command = {[nodeenv]install_command}
+install_command = pip install {opts} {packages}
 setenv =
     {[testenv]setenv}
     PYTHON=coverage run --source zuul --parallel-mode
@@ -68,22 +58,22 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:docs]
+install_command = pip install {opts} {packages}
 deps = -r{toxinidir}/doc/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
   sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html
 
 [testenv:venv]
+install_command = pip install {opts} {packages}
 commands = {posargs}
 
 [testenv:nodepool]
-install_command = {[nodeenv]install_command}
 commands = stestr run --concurrency=1 --test-path ./tests/nodepool {posargs}
 
 [testenv:remote]
 commands = stestr run --test-path ./tests/remote {posargs}
 passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_LOG_DEFAULTS ZUUL_REMOTE_IPV4 ZUUL_SSH_KEY NODEPOOL_ZK_HOST
-install_command = {[nodeenv]install_command}
 
 [flake8]
 # These are ignored intentionally in openstack-infra projects;