Merge "testenv does not install requirements"

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

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

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

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}