python3-xstatic-angular-irdragndrop: Consolidate in a single file

Consolidate inc and bb files into a single bb file.
Since python2 is no longer maintained, the recipe of python2 is removed.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

3 files changed, 19 insertions, 23 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop.inc b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop.inc
deleted file mode 100644
index 90331a9..0000000
--- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "IrDragNDrop javascript library packaged for setuptools"
-HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-IrDragNDrop"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9acc2dfc3a0345c175df08104bd22298"
-
-PYPI_PACKAGE = "XStatic-Angular-IrDragNDrop"
-
-SRC_URI[md5sum] = "6ea8809bae94014aef699d58836dba84"
-SRC_URI[sha256sum] = "5595f4a98ac8f8468f7e56dc916e10c0fc5f0197567899a75755f99fe8b5bd6d"
-
-inherit pypi
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        "
-
-RDEPENDS_${PN} += " \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb
deleted file mode 100644
index 72c8781..0000000
--- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require python-xstatic-angular-irdragndrop.inc
-inherit setuptools3
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb
index 72c8781..b50fe20 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb
@@ -1,2 +1,19 @@
-require python-xstatic-angular-irdragndrop.inc
-inherit setuptools3
+DESCRIPTION = "IrDragNDrop javascript library packaged for setuptools"
+HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-IrDragNDrop"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9acc2dfc3a0345c175df08104bd22298"
+
+PYPI_PACKAGE = "XStatic-Angular-IrDragNDrop"
+
+SRC_URI[md5sum] = "6ea8809bae94014aef699d58836dba84"
+SRC_URI[sha256sum] = "5595f4a98ac8f8468f7e56dc916e10c0fc5f0197567899a75755f99fe8b5bd6d"
+
+inherit setuptools3 pypi
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        "
+
+RDEPENDS_${PN} += " \
+        "