python3-requestsexceptions: Consolidate in a single file

Consolidate inc and bb files into a single bb file.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 23 insertions, 25 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-requestsexceptions.inc b/meta-openstack/recipes-devtools/python/python-requestsexceptions.inc
deleted file mode 100644
index bac99a3..0000000
--- a/meta-openstack/recipes-devtools/python/python-requestsexceptions.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Import exceptions from potentially bundled packages in requests."
-HOMEPAGE = "https://www.openstack.org/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87"
-
-SRC_URI[md5sum] = "f43b246ccd7d5b618e6f0dc946a6c3f3"
-SRC_URI[sha256sum] = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065"
-
-inherit pypi
-
-# conflicting file prevention
-do_install_append() {
-        rm -f ${D}${libdir}/python*/site-packages/tests/*
-}
-
-DEPENDS += " \
-        ${PYTHON_PN}-pbr-native \
-        "
-
-RDEPENDS_${PN} += " \
-        ${PYTHON_PN}-pbr \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb
index 1c049f3..4bf9c0e 100644
--- a/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb
@@ -1,2 +1,23 @@
-inherit setuptools3
-require python-requestsexceptions.inc
+DESCRIPTION = "Import exceptions from potentially bundled packages in requests."
+HOMEPAGE = "https://www.openstack.org/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87"
+
+SRC_URI[md5sum] = "f43b246ccd7d5b618e6f0dc946a6c3f3"
+SRC_URI[sha256sum] = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065"
+
+inherit setuptools3 pypi
+
+# conflicting file prevention
+do_install_append() {
+        rm -f ${D}${libdir}/python*/site-packages/tests/*
+}
+
+DEPENDS += " \
+        ${PYTHON_PN}-pbr-native \
+        "
+
+RDEPENDS_${PN} += " \
+        ${PYTHON_PN}-pbr \
+        "