python-kombu: uprev to v4.1.0

This version is required for python-oslo.messaging when moved to
stable/pike. We can drop the v3.0.37 version as it is no longer
required allowing us to only have one recipe.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

4 files changed, 16 insertions, 44 deletions

diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index ceb489b..302b657 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -19,6 +19,5 @@ PREFERRED_VERSION_python-django = "1.8.6"
 PREFERRED_VERSION_python-netaddr = "0.7.19"
 PREFERRED_VERSION_python-sqlalchemy = "1.0.16"
 PREFERRED_VERSION_python-requests = "2.13.0"
-PREFERRED_VERSION_python-kombu = "3.0.%"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-openstack/recipes-devtools/python/python-kombu_3.0.37.bb b/meta-openstack/recipes-devtools/python/python-kombu_3.0.37.bb
deleted file mode 100644
index 16e3f0a..0000000
--- a/meta-openstack/recipes-devtools/python/python-kombu_3.0.37.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "A messaging framework for Python"
-HOMEPAGE = "http://kombu.readthedocs.org"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ee3b641e9940ba25a4dd66b3942866cf"
-
-SRCNAME = "kombu"
-
-SRC_URI = "https://pypi.io/packages/source/k/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "a1901036ba5e70e6b1733f7c2d5ee313"
-SRC_URI[sha256sum] = "e064a00c66b4d1058cd2b0523fb8d98c82c18450244177b6c0f7913016642650"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-FILES_${PN}-doc += "${datadir}/${SRCNAME}"
-
-RDEPENDS_${PN} = " \
-    python-anyjson \
-    python-amqp \
-    "
diff --git a/meta-openstack/recipes-devtools/python/python-kombu_4.0.2.bb b/meta-openstack/recipes-devtools/python/python-kombu_4.0.2.bb
deleted file mode 100644
index 66fe763..0000000
--- a/meta-openstack/recipes-devtools/python/python-kombu_4.0.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "A messaging framework for Python"
-HOMEPAGE = "http://kombu.readthedocs.org"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=daea7c168428449fbee05e644df929f4"
-
-SRCNAME = "kombu"
-
-SRC_URI = "https://pypi.python.org/packages/c7/76/58c655a80bf08b703478ce673ed4e3029297105951863b73030d45b06b42/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "1f24f3a8addf8f3eb0f463aad970f0fb"
-SRC_URI[sha256sum] = "d0fc6f2a36610a308f838db4b832dad79a681b516ac1d1a1f9d42edb58cc11a2"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-FILES_${PN}-doc += "${datadir}/${SRCNAME}"
-
-RDEPENDS_${PN} = "python-anyjson python-amqplib"
diff --git a/meta-openstack/recipes-devtools/python/python-kombu_4.1.0.bb b/meta-openstack/recipes-devtools/python/python-kombu_4.1.0.bb
new file mode 100644
index 0000000..8d44426
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-kombu_4.1.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A messaging framework for Python"
+HOMEPAGE = "http://kombu.readthedocs.org"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=daea7c168428449fbee05e644df929f4"
+
+SRC_URI[md5sum] = "2fb2be9fec0e6514231bba23a3779439"
+SRC_URI[sha256sum] = "4249d9dd9dbf1fcec471d1c2def20653c9310dd1a217272d77e4844f9d5273cb"
+
+inherit setuptools pypi
+
+FILES_${PN}-doc += "${datadir}/${SRCNAME}"
+
+RDEPENDS_${PN} = " \
+        python-amqp \
+        "