From f979456c16695a25f7de85410e85a433298153be Mon Sep 17 00:00:00 2001
From: Kaifeng Wang <kaifeng.w@gmail.com>
Date: Fri, 12 Jul 2019 15:43:55 +0800
Subject: [PATCH] testenv does not install requirements

Fix testenv which only installs test-requirement, also updated
upper constraint url.

mock minimum version is bumped to 3.0.0,
keystonemiddleware minimum version is bumped to 4.18.0.

Change-Id: I162bcf372598c2268c9c5e30947e49eedb0147e3
---
 lower-constraints.txt | 4 ++--
 requirements.txt      | 2 +-
 test-requirements.txt | 2 +-
 tox.ini               | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 89c9d5f7c..cef1fe9ae 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -43,12 +43,12 @@ jsonpath-rw==1.2.0
 jsonpointer==2.0
 jsonschema==2.6.0
 keystoneauth1==3.4.0
-keystonemiddleware==4.17.0
+keystonemiddleware==4.18.0
 linecache2==1.0.0
 Mako==1.0.7
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
+mock==3.0.0
 monotonic==1.4
 mox3==0.25.0
 msgpack==0.5.6
diff --git a/requirements.txt b/requirements.txt
index ae6ea25be..024a05b0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ ironic-lib>=2.17.0 # Apache-2.0
 jsonpath-rw<2.0,>=1.2.0 # Apache-2.0
 jsonschema>=2.6.0 # MIT
 keystoneauth1>=3.4.0 # Apache-2.0
-keystonemiddleware>=4.17.0 # Apache-2.0
+keystonemiddleware>=4.18.0 # Apache-2.0
 netaddr>=0.7.18 # BSD
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 python-ironicclient>=2.3.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index ce3392e8f..4af9b6252 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 flake8-import-order>=0.13 # LGPLv3
 hacking>=1.0.0,<1.2.0 # Apache-2.0
-mock>=2.0.0 # BSD
+mock>=3.0.0 # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index c02f33796..6c783b3d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,10 @@ envlist = py3,py27,pep8,functional
 
 [testenv]
 usedevelop = True
-install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -U {opts} {packages}
 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}