From ee9b1b5d512384967ea7998b04a250928014d18a Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 27 Nov 2013 11:11:28 -0500
Subject: python-cliff: uprev to havana nova-api minimum requirements

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../remove-distribute-dependency.patch             | 23 ----------------------
 .../recipes-devtools/python/python-cliff_1.3.2.bb  | 22 ---------------------
 .../recipes-devtools/python/python-cliff_1.4.5.bb  | 21 ++++++++++++++++++++
 3 files changed, 21 insertions(+), 45 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-cliff/remove-distribute-dependency.patch
 delete mode 100644 meta-openstack/recipes-devtools/python/python-cliff_1.3.2.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-cliff_1.4.5.bb

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

diff --git a/meta-openstack/recipes-devtools/python/python-cliff/remove-distribute-dependency.patch b/meta-openstack/recipes-devtools/python/python-cliff/remove-distribute-dependency.patch
deleted file mode 100644
index 18aab4c..0000000
--- a/meta-openstack/recipes-devtools/python/python-cliff/remove-distribute-dependency.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: cliff-1.3.2/setup.py
-===================================================================
---- cliff-1.3.2.orig/setup.py
-+++ cliff-1.3.2/setup.py
-@@ -5,10 +5,6 @@ PROJECT = 'cliff'
- # Change docs/source/conf.py too!
- VERSION = '1.3.2'
- 
--# Bootstrap installation of Distribute
--import distribute_setup
--distribute_setup.use_setuptools()
--
- from setuptools import setup, find_packages
- 
- from distutils.util import convert_path
-@@ -22,7 +18,6 @@ except IOError:
-     long_description = ''
- 
- install_requires = [
--    'distribute',
-     'PrettyTable>=0.6,<0.8',
-     'cmd2==0.6.4',
- ]
diff --git a/meta-openstack/recipes-devtools/python/python-cliff_1.3.2.bb b/meta-openstack/recipes-devtools/python/python-cliff_1.3.2.bb
deleted file mode 100644
index 05de68b..0000000
--- a/meta-openstack/recipes-devtools/python/python-cliff_1.3.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Command Line Interface Formulation Framework"
-HOMEPAGE = "https://github.com/dreamhost/cliff"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PR = "r0"
-SRCNAME = "cliff"
-
-SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://remove-distribute-dependency.patch"
-
-SRC_URI[md5sum] = "a42f7894dbc70f42c0979042175f1b8f"
-SRC_URI[sha256sum] = "7c0250b5139993d04dcbb8b9d05376094b7271586b3698b4764c7c6f4697e0f8"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-prettytable \
-            python-cmd2 \
-            python-pyparsing"
diff --git a/meta-openstack/recipes-devtools/python/python-cliff_1.4.5.bb b/meta-openstack/recipes-devtools/python/python-cliff_1.4.5.bb
new file mode 100644
index 0000000..793ceca
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cliff_1.4.5.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Command Line Interface Formulation Framework"
+HOMEPAGE = "https://github.com/dreamhost/cliff"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+PR = "r0"
+SRCNAME = "cliff"
+
+SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "21743e9e800cf526e88e420f366a4c5c"
+SRC_URI[sha256sum] = "0ec2c40e899cbb4d478aa946e1430600bf596ca2a3f12162a9514e9d580935ec"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+RDEPENDS_${PN} += "python-prettytable \
+            python-cmd2 \
+            python-pyparsing"
-- 
cgit v1.2.3-54-g00ecf