From 5b02cf7dbb6426eab6c0c5a051782e7e6ad96016 Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Thu, 19 Mar 2015 18:40:38 +0200 Subject: [PATCH] Adjust "kombu" version in requirements.txt: set the lower bound - "kombu>=2.5.0" according to https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43 Related-bug:#1434093 Change-Id: Icf07e19dfd84dffa3c816d5e7fb5db5b51112ee4 --- ...st-kombu-version-in-requirements.txt.patch | 30 +++++++++++++++++++ rpm/SPECS/openstack-cinder.spec | 2 ++ trusty/debian/changelog | 6 ++++ ...irements.txt-adjust-for-Ubuntu-14.04.patch | 30 +++++++++++++------ 4 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 rpm/SOURCES/0002-Adjust-kombu-version-in-requirements.txt.patch diff --git a/rpm/SOURCES/0002-Adjust-kombu-version-in-requirements.txt.patch b/rpm/SOURCES/0002-Adjust-kombu-version-in-requirements.txt.patch new file mode 100644 index 000000000..f6e58ee4b --- /dev/null +++ b/rpm/SOURCES/0002-Adjust-kombu-version-in-requirements.txt.patch @@ -0,0 +1,30 @@ +From feb3187b939e56a94ae55a6e63f4483420203ca1 Mon Sep 17 00:00:00 2001 +From: Maksym Yatsenko +Date: Thu, 19 Mar 2015 18:55:20 +0200 +Subject: [PATCH] Adjust "kombu" version in requirements.txt + + Adjust "kombu" version in requirements.txt: + set the lower bound - "kombu>=2.5.0" according to + https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43 + Related-bug:#1434093 + +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index 0e29079..ecbe458 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -10,7 +10,7 @@ eventlet>=0.15.1,<=0.15.2 + greenlet>=0.3.2,<=0.4.2 + iso8601>=0.1.9,<=0.1.10 + keystonemiddleware>=1.0.0,<1.4.0 +-kombu>=3.0.7 ++kombu>=2.5.0 + lxml>=2.3,<=3.3.3 + netaddr>=0.7.12,<=0.7.13 + oslo.config>=1.4.0,<=1.6.0 # Apache-2.0 +-- +1.9.1 + diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index 94c3d844d..f494459cd 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -24,6 +24,7 @@ Source20: cinder-sudoers # patches_base=2014.1.1 # Patch0001: 0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch +Patch0002: 0002-Adjust-kombu-version-in-requirements.txt.patch BuildArch: noarch BuildRequires: intltool @@ -152,6 +153,7 @@ This package contains documentation files for cinder. %setup -q -n cinder-%{version} %patch0001 -p1 +%patch0002 -p1 find . \( -name .gitignore -o -name .placeholder \) -delete diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 79a786701..68a7944fc 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +cinder (1:2014.2.2-fuel6.1+14.04+3) trusty; urgency=medium + + * fix kombu version in requirements (Related-bug: #1434093) + + -- Maksym Yatsenko Fri, 20 Mar 2015 12:27:24 +0300 + cinder (1:2014.2.2-fuel6.1+14.04+2) trusty; urgency=medium * Update dependencies for current tag diff --git a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch index 11a60c6f3..c3e0221ec 100644 --- a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch +++ b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch @@ -1,20 +1,25 @@ -From e88ed514f7e503e8b8c985c88fa33569f5bd8c30 Mon Sep 17 00:00:00 2001 -From: Sergey Kolekonov -Date: Sun, 15 Mar 2015 23:09:42 +0300 -Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04 +From ecd4f4fea4220215019232e890ad4342e48a5c29 Mon Sep 17 00:00:00 2001 +From: Maksym Yatsenko +Date: Thu, 19 Mar 2015 18:36:55 +0200 +Subject: [PATCH] requirements.txt-adjust-for-Ubuntu-14.04 * argparse and wsgiref are parts of the standard library in python 2.7 * Routes!=2.0 restriction is necessary only for running tests with python 3.x, routes 2.0 work just fine with python 2.7 +* adjust "kombu" version in requirements.txt: set the lower bound + - "kombu>=2.5.0" according to: + https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43 + Related-bug:#1434093 + --- - requirements.txt | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + requirements.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt -index 0e29079..5ea45eb 100644 +index 0e29079..ab5ace1 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -4,7 +4,6 @@ +@@ -4,13 +4,12 @@ pbr>=0.6,!=0.7,<1.0 anyjson>=0.3.3,<=0.3.3 @@ -22,6 +27,13 @@ index 0e29079..5ea45eb 100644 Babel>=1.3,<=1.3 eventlet>=0.15.1,<=0.15.2 greenlet>=0.3.2,<=0.4.2 + iso8601>=0.1.9,<=0.1.10 + keystonemiddleware>=1.0.0,<1.4.0 +-kombu>=3.0.7 ++kombu>=2.5.0 + lxml>=2.3,<=3.3.3 + netaddr>=0.7.12,<=0.7.13 + oslo.config>=1.4.0,<=1.6.0 # Apache-2.0 @@ -27,7 +26,7 @@ python-glanceclient>=0.14.0,<=0.15.0 python-novaclient>=2.18.0,<=2.20.0 python-swiftclient>=2.2.0,<=2.3.1 @@ -38,5 +50,5 @@ index 0e29079..5ea45eb 100644 -wsgiref>=0.1.2 oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0 -- -1.9.5 (Apple Git-50.3) +1.9.1 -- 2.45.2