python3-testscenarios: 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, 24 insertions, 26 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-testscenarios.inc b/meta-openstack/recipes-devtools/python/python-testscenarios.inc
deleted file mode 100644
index 1008f11..0000000
--- a/meta-openstack/recipes-devtools/python/python-testscenarios.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "testscenarios: a pyunit extension for dependency injection"
-HOMEPAGE = "https://pypi.python.org/pypi/testscenarios"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://BSD;md5=0805e4f024d089a52dca0671a65b8b66"
-
-SRC_URI[md5sum] = "859073d9e7b049aee2e6704c51f6001a"
-SRC_URI[sha256sum] = "c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6"
-
-inherit pypi
-
-DEPENDS += "\
-    ${PYTHON_PN}-pbr \
-    "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-    ${PYTHON_PN}-pbr-native \
-    "
-
-RDEPENDS_${PN} += "\
-    ${PYTHON_PN}-testtools \
-    ${PYTHON_PN}-pbr \
-    "
diff --git a/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb b/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb
index 6f7d418..92523c2 100644
--- a/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb
@@ -1,2 +1,24 @@
-inherit setuptools3
-require python-testscenarios.inc
+DESCRIPTION = "testscenarios: a pyunit extension for dependency injection"
+HOMEPAGE = "https://pypi.python.org/pypi/testscenarios"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://BSD;md5=0805e4f024d089a52dca0671a65b8b66"
+
+SRC_URI[md5sum] = "859073d9e7b049aee2e6704c51f6001a"
+SRC_URI[sha256sum] = "c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6"
+
+inherit setuptools3 pypi
+
+DEPENDS += "\
+    ${PYTHON_PN}-pbr \
+    "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+    ${PYTHON_PN}-pbr-native \
+    "
+
+RDEPENDS_${PN} += "\
+    ${PYTHON_PN}-testtools \
+    ${PYTHON_PN}-pbr \
+    "