Merge remote-tracking branch 'origin/pyro' into master-enea-newton

3 files changed, 13 insertions, 17 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb b/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb
index a3a7ec0..fef8d5f 100644
--- a/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb
@@ -17,3 +17,8 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit setuptools
 
 DEPENDS += "python-vcversioner"
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        python-vcversioner-native \
+        "
diff --git a/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb b/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb
deleted file mode 100644
index 32d9ebb..0000000
--- a/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Python parsing module"
-HOMEPAGE = "http://pyparsing.wikispaces.com/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fb46329938e6bc829b256e37d5c1e31a"
-
-PR = "r0"
-SRCNAME = "pyparsing"
-
-SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.zip"
-
-SRC_URI[md5sum] = "dc7036a6f1ab01c3baed3d97af8d77c0"
-SRC_URI[sha256sum] = "7e1766ee747cca79fe172b670fd53ef58fc55d2b1804fd6c66d857abb62d143a"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb b/meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb
index 2fe96ab..bcff6f3 100644
--- a/meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb
@@ -14,3 +14,11 @@ SRC_URI[sha256sum] = "acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+
+DEPENDS_class-native += " \
+        python \
+        python-setuptools \
+        "
+
+BBCLASSEXTEND = "native"