From 54179a2d187fd082456444c1f600fd6e9a07b7e8 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 12 Mar 2015 01:22:46 -0400
Subject: nova: fix jsonschema and retrying depdencies

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-jsonschema_2.4.0.bb              |  2 +-
 .../recipes-devtools/python/python-nova_git.bb     |  1 +
 .../python/python-retrying_1.2.2.bb                | 27 ----------------------
 .../python/python-retrying_1.3.3.bb                | 27 ++++++++++++++++++++++
 4 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-retrying_1.2.2.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-retrying_1.3.3.bb

(limited to 'meta-openstack/recipes-devtools')

diff --git a/meta-openstack/recipes-devtools/python/python-jsonschema_2.4.0.bb b/meta-openstack/recipes-devtools/python/python-jsonschema_2.4.0.bb
index 89fb670..e27a242 100644
--- a/meta-openstack/recipes-devtools/python/python-jsonschema_2.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-jsonschema_2.4.0.bb
@@ -14,4 +14,4 @@ SRC_URI[sha256sum] = "acf1e360b4682d64ba6acc35dbc65d81d9bde68a291a97f14f16f42827
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit distutils
+inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 4966250..9926208 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -304,6 +304,7 @@ RDEPENDS_${PN} = " libvirt \
 		   python-pyasn1 \
 		   python-setuptools-git \
 		   python-simplejson \
+		   python-jsonschema \
 		   python-six \
 		   python-setuptools \
 		   python-sqlalchemy \
diff --git a/meta-openstack/recipes-devtools/python/python-retrying_1.2.2.bb b/meta-openstack/recipes-devtools/python/python-retrying_1.2.2.bb
deleted file mode 100644
index cbb5ac3..0000000
--- a/meta-openstack/recipes-devtools/python/python-retrying_1.2.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Retrying"
-HOMEPAGE = "https://github.com/rholder/retrying"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
-
-PR = "r0"
-
-SRCNAME = "retrying"
-SRC_URI = "http://pypi.python.org/packages/source/r/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "534825ad47c3e317f52090f642113870"
-SRC_URI[sha256sum] = "fbeda85e94d103cf8bb36d29644abdc1e9ad367dd2c7160324fa60ee9d5193d0"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        python-pip \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python-retrying_1.3.3.bb b/meta-openstack/recipes-devtools/python/python-retrying_1.3.3.bb
new file mode 100644
index 0000000..053b909
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-retrying_1.3.3.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Retrying"
+HOMEPAGE = "https://github.com/rholder/retrying"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
+
+PR = "r0"
+
+SRCNAME = "retrying"
+SRC_URI = "http://pypi.python.org/packages/source/r/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "2a126aeef8b21324ecdeac15ff46ef17"
+SRC_URI[sha256sum] = "08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        python-pip \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        "
-- 
cgit v1.2.3-54-g00ecf