From 0513ee7ec1b0286e69a84a63185ffd3df1df87fb Mon Sep 17 00:00:00 2001
From: zhengruoqin <zhengrq.fnst@cn.fujitsu.com>
Date: Tue, 27 Oct 2020 13:29:56 +0800
Subject: python3-retrying: 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>
---
 .../recipes-devtools/python/python-retrying.inc    | 20 --------------------
 .../python/python3-retrying_1.3.3.bb               | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-retrying.inc

diff --git a/meta-openstack/recipes-devtools/python/python-retrying.inc b/meta-openstack/recipes-devtools/python/python-retrying.inc
deleted file mode 100644
index b33dc90..0000000
--- a/meta-openstack/recipes-devtools/python/python-retrying.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Retrying"
-HOMEPAGE = "https://github.com/rholder/retrying"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
-
-SRC_URI[md5sum] = "2a126aeef8b21324ecdeac15ff46ef17"
-SRC_URI[sha256sum] = "08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b"
-
-inherit pypi
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb
index 9f001fe..e599670 100644
--- a/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb
@@ -1,2 +1,20 @@
-require python-retrying.inc
-inherit setuptools3
+DESCRIPTION = "Retrying"
+HOMEPAGE = "https://github.com/rholder/retrying"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
+
+SRC_URI[md5sum] = "2a126aeef8b21324ecdeac15ff46ef17"
+SRC_URI[sha256sum] = "08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b"
+
+inherit setuptools3 pypi
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        "
-- 
cgit v1.2.3-54-g00ecf