From fce2cd4f4996824c5512270138cb8f237457acec Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Fri, 18 Oct 2019 20:55:45 +0000
Subject: [PATCH] Revert "Clean up requirements.txt from tox.ini"

It appears that these are required to have the upper constraints properly applied. We need to revert this change.

This reverts commit 7b8e6de1b8230e5d31ca36624e7fdfba25e3e077.

Change-Id: I4941df3894148482c597d30f3a8db70659fd1b7a
---
 tox.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tox.ini b/tox.ini
index 56206176af..f078c95140 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,7 @@ install_command =
     pip install {opts} {packages}
 whitelist_externals = find
 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
   stestr run {posargs}
@@ -22,6 +23,7 @@ basepython = python3
 # the API Ref to docs.openstack.org.
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 whitelist_externals = rm
 commands =
@@ -92,6 +94,7 @@ whitelist_externals =
 basepython = python3
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 whitelist_externals = rm
 commands =
@@ -174,6 +177,7 @@ max-line-length = 79
 basepython = python3
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 whitelist_externals = rm
 commands =