From c2d6d72e0e282d61e4dceb42d94968bef05de391 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Thu, 10 Oct 2013 11:20:00 +0400 Subject: [PATCH] Cherry-picked changes from release-0.3 * version bumped to 0.3 * puka doesn't work with unicode strings in message header * upgrade to puka 1.0.7d Change-Id: I1620fb5e03d813c0e0aa4cb41b91f964de1bc63c --- muranocommon/messaging/mqclient.py | 2 +- requirements.txt | 2 +- setup.cfg | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/muranocommon/messaging/mqclient.py b/muranocommon/messaging/mqclient.py index 76f2ac4..93c2d5c 100644 --- a/muranocommon/messaging/mqclient.py +++ b/muranocommon/messaging/mqclient.py @@ -90,7 +90,7 @@ class MqClient(object): if not self._connected: raise RuntimeError('Not connected to RabbitMQ') - headers = {'message_id': message.id} + headers = {'message_id': str(message.id)} promise = self._client.basic_publish( exchange=str(exchange), diff --git a/requirements.txt b/requirements.txt index fdf2d79..8ad649c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ pbr>=0.5.21,<1.0 anyjson>=0.3.3 eventlet>=0.13.0 -https://github.com/istalker2/puka/releases/download/1.0.7c/puka-1.0.7c.tar.gz#egg=puka-1.0.7c +https://github.com/istalker2/puka/releases/download/1.0.7d/puka-1.0.7d.tar.gz#egg=puka-1.0.7d diff --git a/setup.cfg b/setup.cfg index 7050d7d..4561284 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,21 @@ +# Copyright (c) 2013 Mirantis, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + [metadata] name = murano-common +version = 0.3 summary = Shared library for Murano description-file = README.rst