From f43647b3edf8024669f378f1943278081ce9bd85 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Thu, 16 May 2019 18:23:46 +1000
Subject: [PATCH] Fix where we use constraints

in I2598503c2d4397d7efbb03a76df9a4e91dd0c1cf we mistakenly added
constraints to install_command in out based testenv.  This is incorrect
as it means the generate env will be run in a constrained environment.

We don't use UPPER_CONSTRAINT_FILE as *right now* it's the same thing
and this leaves us internally consistent (even if technically incorrect)

Change-Id: Ia61d944dbfdf494598e41e5fbefd0e32a91814ed
---
 tox.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 4fab1099d7..d5a875efed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,9 +7,10 @@ ignore_basepython_conflict=true
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install -U {opts} -c {toxinidir}/upper-constraints.txt {packages}
+install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
+deps = -c{toxinidir}/upper-constraints.txt
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
   stestr run {posargs}