From a8fb6aa0f4d3b59bd898c21ec96e4b06240b59ce Mon Sep 17 00:00:00 2001
From: Benjamin Michael Cooper <bcooper@cray.com>
Date: Tue, 15 Aug 2017 11:01:06 +0100
Subject: [PATCH] Fix OpenStack dependencies

Respect upper-constraints.txt
To prevent pip installing the latest and greatest packages
(which may break Bareon), pin the version to those specified
in the upper-constraints.txt file from the openstack
requirements repo.

Fix hacking module version
Change hacking version in pep8 tox tests to prevent conflict
with other openstack requirements.

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

diff --git a/tox.ini b/tox.ini
index 2e44208..3508baa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = py27,py34,func,pep8
 
 [testenv]
 usedevelop = True
-install_command = pip install --allow-external -U {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 deps = -r{toxinidir}/requirements.txt
@@ -14,7 +14,7 @@ commands =
   py.test -vv {posargs:bareon/tests}
 
 [testenv:pep8]
-deps = hacking==0.10.2
+deps = hacking>=0.10.3
 commands =
   flake8 {posargs:bareon}
   flake8 {posargs:contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap}