From c7656a12ec8ca6a35d4ef40c0cd62d9a2ec68079 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Fri, 5 Feb 2016 16:19:59 +1100
Subject: [PATCH] Manually install testtools < 2.0.0

testtools 2.0.0 was released 2016-02-04 and has a hard requirement on
on fixtures >=1.3.0 which isn't compatible with stable/kilo's
global-requirements.

We can't land an update to requirements to cap testtools as we install
testtools (2.0.0) too soon and nothing we install from git in a typical
devstack run requires testtools (it's only listed in
test-requirements.txt) get 2.0.0.

Manually force testtools to match the desired requirements spec until we
can:
. Land the g-r patch
. merge the update and release that in os-testr (stable/kilo)

Related-Bug: 1542164
Change-Id: I3368cf69969c08f3017cda4041f23a0b8580d5b0
---
 stack.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/stack.sh b/stack.sh
index db5e815f0a..87e7f99129 100755
--- a/stack.sh
+++ b/stack.sh
@@ -695,6 +695,22 @@ if [[ "$OFFLINE" != "True" ]]; then
     PYPI_ALTERNATIVE_URL=${PYPI_ALTERNATIVE_URL:-""} $TOP_DIR/tools/install_pip.sh
 fi
 
+# NOTE(tonyb): This should be removed ASAP
+# testtools 2.0.0 was released 2016-02-04 and has a hard requirement on
+# on fixtures >=1.3.0 which isn't compatible with stable/kilo's
+# global-requirements.
+#
+# We can't land an update to requirements to cap testtools as we install
+# testtools (2.0.0) too soon and nothing we install from git in a typical
+# devstack run requires testtools (it's only listed in
+# test-requirements.txt) get 2.0.0.
+#
+# Manually force testtools to match the desired requirements spec until we
+# can:
+# . Land the g-r patch
+# . merge the update and release that in os-testr (stable/kilo)
+pip_install "testtools>=0.9.36,!=1.2.0,<2.0.0"
+
 # Install subunit for the subunit output stream
 pip_install_gr os-testr