From 7428cd9e30d1d92fead5bcc4bd8ffb27d26ac646 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Fri, 12 Jun 2015 17:05:15 +0200
Subject: [PATCH] Use pyngus>=1.3.1
Pyngus 1.3.1 has been released and it fixes the issues that blocked the
gate last time. This version of the library is required for the amqp
driver in oslo.messaging.
Change-Id: I4ba583e062674b27ad873ca2228274f383f2bb22
---
global-requirements.txt | 6 +++---
tools/integration.sh | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/global-requirements.txt b/global-requirements.txt
index fdf0e07e74..06c9b6ea47 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -112,9 +112,9 @@ pymemcache>=1.2.9 # Apache 2.0 License
pymongo>=2.6.3
PyMySQL>=0.6.2 # MIT License
-# NOTE(dims): pyngus 1.3.0 depends on an unreleased python-qpid-proton
-# version, so we should unpin this once this problem is fixed.
-pyngus==1.2.0 # Apache 2.0 License
+# NOTE(flaper87): This added 2 packages to `integration.sh`
+# uuid-dev and swig
+pyngus>=1.3.1 # Apache 2.0 License
pyOpenSSL>=0.11
pyparsing>=2.0.1
diff --git a/tools/integration.sh b/tools/integration.sh
index 7ba417914c..2c86490a44 100644
--- a/tools/integration.sh
+++ b/tools/integration.sh
@@ -28,6 +28,9 @@ REPODIR=${REPODIR:-$BASE/new}
# TODO: Figure out how to get this on to the box properly
sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libzmq-dev libffi-dev libldap2-dev libsasl2-dev ccache
+# NOTE(flaper87): Temporarly needed for proton
+sudo apt-get install -y --force-yes uuid-dev swig
+
# FOR numpy / pyyaml
sudo apt-get build-dep -y --force-yes python-numpy
sudo apt-get build-dep -y --force-yes python-yaml