Merge branch 'master' into kilo

15 files changed, 20 insertions, 174 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cliff_1.10.0.bb b/meta-openstack/recipes-devtools/python/python-cliff_1.10.0.bb
index da7e334..7a6bb83 100644
--- a/meta-openstack/recipes-devtools/python/python-cliff_1.10.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-cliff_1.10.0.bb
@@ -19,3 +19,5 @@ inherit setuptools
 RDEPENDS_${PN} += "python-prettytable \
             python-cmd2 \
             python-pyparsing"
+
+CLEANBROKEN = "1"
diff --git a/meta-openstack/recipes-devtools/python/python-flask_0.10.1.bb b/meta-openstack/recipes-devtools/python/python-flask_0.10.1.bb
deleted file mode 100644
index 263e53d..0000000
--- a/meta-openstack/recipes-devtools/python/python-flask_0.10.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE = "https://pypi.python.org/pypi/Flask/"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=79aa8b7bc4f781210d6b5c06d6424cb0"
-
-PR = "r0"
-SRCNAME = "Flask"
-
-SRC_URI = "https://pypi.python.org/packages/source/F/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "378670fe456957eb3c27ddaef60b2b24"
-SRC_URI[sha256sum] = "4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-CLEANBROKEN = "1"
-
diff --git a/meta-openstack/recipes-devtools/python/python-itsdangerous_0.24.bb b/meta-openstack/recipes-devtools/python/python-itsdangerous_0.24.bb
deleted file mode 100644
index 3e229f8..0000000
--- a/meta-openstack/recipes-devtools/python/python-itsdangerous_0.24.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE = "https://pypi.python.org/pypi/itsdangerous/"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b61841e2bf5f07884148e2a6f1bcab0c"
-
-PR = "r0"
-SRCNAME = "itsdangerous"
-
-SRC_URI = "https://pypi.python.org/packages/source/i/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "a3d55aa79369aef5345c036a8a26307f"
-SRC_URI[sha256sum] = "cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-json python-netclient python-zlib python-datetime python-lang python-crypt"
-
-CLEANBROKEN = "1"
-
diff --git a/meta-openstack/recipes-devtools/python/python-pbr_0.10.8.bb b/meta-openstack/recipes-devtools/python/python-pbr_0.10.8.bb
index ae8f44a..ec5c589 100644
--- a/meta-openstack/recipes-devtools/python/python-pbr_0.10.8.bb
+++ b/meta-openstack/recipes-devtools/python/python-pbr_0.10.8.bb
@@ -16,4 +16,12 @@ 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-pecan_0.5.0.bb b/meta-openstack/recipes-devtools/python/python-pecan_0.8.3.bb
index ea546f8..e7f32cd 100644
--- a/meta-openstack/recipes-devtools/python/python-pecan_0.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-pecan_0.8.3.bb
@@ -10,8 +10,8 @@ SRCNAME = "pecan"
 SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
 "
 
-SRC_URI[md5sum] = "819ea890e8a0412717b8aa791595725f"
-SRC_URI[sha256sum] = "726d000cc2b5078de560a9a69e29637c59fc93b6707b292a56bdb0a466555922"
+SRC_URI[md5sum] = "e2b329c5088c2adb1510ac9d1af84bca"
+SRC_URI[sha256sum] = "ca6c31e1fb98e4ae780a44a40a88eacb7a19172d3f64d4e31f32049a784a1281"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-pep8_1.4.6.bb b/meta-openstack/recipes-devtools/python/python-pep8_1.6.2.bb
index 723bec3..723bec3 100644
--- a/meta-openstack/recipes-devtools/python/python-pep8_1.4.6.bb
+++ b/meta-openstack/recipes-devtools/python/python-pep8_1.6.2.bb
diff --git a/meta-openstack/recipes-devtools/python/python-posix-ipc_0.9.8.bb b/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.0.bb
index 6c3fb53..5da3f92 100644
--- a/meta-openstack/recipes-devtools/python/python-posix-ipc_0.9.8.bb
+++ b/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.0.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRCNAME = "posix_ipc"
 SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "f3e78df4ab4e0f43ea04ef5c53563970"
-SRC_URI[sha256sum] = "271446eb133efb7410eb51265807aa54e0acb8eb7c2abcf027e51b4cb36d36dd"
+SRC_URI[md5sum] = "85607a392087715ac3a3c7ded2492d06"
+SRC_URI[sha256sum] = "9c93070374ca672725575e5c9874930c8cde69367fb90378b2255e048e31efcb"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-py_1.4.20.bb b/meta-openstack/recipes-devtools/python/python-py_1.4.26.bb
index 0040cd7..53a5045 100644
--- a/meta-openstack/recipes-devtools/python/python-py_1.4.20.bb
+++ b/meta-openstack/recipes-devtools/python/python-py_1.4.26.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRCNAME = "py"
 SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5f1708be5482f3ff6711dfd6cafd45e0"
-SRC_URI[sha256sum] = "23c99d99ebb2a60eb7023b7577bfc988acb0092082257a57189f100ce84b72f1"
+SRC_URI[md5sum] = "30c3fd92a53f1a5ed6f3591c1fe75c0e"
+SRC_URI[sha256sum] = "28dd0b90d29b386afb552efc4e355c889f4639ce93658a7872a2150ece28bb89"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-pyasn1_0.1.6.bb b/meta-openstack/recipes-devtools/python/python-pyasn1_0.1.7.bb
index a56ca95..c4b0569 100644
--- a/meta-openstack/recipes-devtools/python/python-pyasn1_0.1.6.bb
+++ b/meta-openstack/recipes-devtools/python/python-pyasn1_0.1.7.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "ASN.1 types and codecs"
 HOMEPAGE = "http://sourceforge.net/projects/pyasn1/"
 SECTION = "devel/python"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6ccc3f3f25785e9d645699e5d7433942"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae098273b2cf8b4af164ac20e32bddf7"
 
 PR = "r0"
 SRCNAME = "pyasn1"
 
-SRC_URI = "http://pypi.python.org/packages/source/p/pyasn1/pyasn1-0.1.6.tar.gz"
+SRC_URI = "http://pypi.python.org/packages/source/p/pyasn1/pyasn1-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "e1851ac1123c50f134cc29420fd5e0bd"
-SRC_URI[sha256sum] = "a7c51782cea4d823454915ad46a580fe53b9adfe6514560d4b9cb590e002be35"
+SRC_URI[md5sum] = "2cbd80fcd4c7b1c82180d3d76fee18c8"
+SRC_URI[sha256sum] = "e4f81d53c533f6bd9526b047f047f7b101c24ab17339c1a7ad8f98b25c101eab"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-requests_1.2.0.bb b/meta-openstack/recipes-devtools/python/python-requests_1.2.0.bb
deleted file mode 100644
index c6b589a..0000000
--- a/meta-openstack/recipes-devtools/python/python-requests_1.2.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Python HTTP for Humans."
-HOMEPAGE = "http://python-requests.org"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c858703330162aa799141655a10fe120"
-
-PR = "r0"
-SRCNAME = "requests"
-
-SRC_URI = "http://pypi.python.org/packages/source/r/requests/requests-1.2.0.tar.gz"
-
-SRC_URI[md5sum] = "22af2682233770e5468a986f451c51c0"
-SRC_URI[sha256sum] = "cfa615644ae38efe8423ce9edb23470a4615a9147fa3cea5026afb47c9bb3913"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-six_1.7.3.bb b/meta-openstack/recipes-devtools/python/python-six_1.7.3.bb
deleted file mode 100644
index 07dcafd..0000000
--- a/meta-openstack/recipes-devtools/python/python-six_1.7.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Python 2 and 3 compatibility utilities"
-HOMEPAGE = "http://pypi.python.org/pypi/six/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=530f34047c21ad45b3199946dd90bea5"
-
-PR = "r1"
-SRCNAME = "six"
-
-SRC_URI = "https://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "784c6e5541c3c4952de9c0a966a0a80b"
-SRC_URI[sha256sum] = "7a842c9f882c0b2ab1064d567bb9fff6a21c9efbc3d9992083ad6193787ed393"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-sphinx_1.2b1.bb b/meta-openstack/recipes-devtools/python/python-sphinx_1.2b1.bb
deleted file mode 100644
index acdba56..0000000
--- a/meta-openstack/recipes-devtools/python/python-sphinx_1.2b1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Python documentation generator"
-HOMEPAGE = "http://sphinx-doc.org/"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=da9cf9fa4e0d0076dd4d116777ad401e"
-
-PR = "r0"
-SRCNAME = "Sphinx"
-
-SRC_URI = "http://pypi.python.org/packages/source/S/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "67bea6df63be8e2a76ebedc76d8f71a3"
-SRC_URI[sha256sum] = "16102b69e939d9ee60b05d694a804a83e3ce047c283f6b981a83573a75ea718d"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-sqlalchemy_0.9.7.bb b/meta-openstack/recipes-devtools/python/python-sqlalchemy_0.9.7.bb
deleted file mode 100644
index 6207233..0000000
--- a/meta-openstack/recipes-devtools/python/python-sqlalchemy_0.9.7.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \
-application developers the full power and flexibility of SQL"
-HOMEPAGE = "http://www.sqlalchemy.org/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6c90a3830628085e8ba945f94d622cb2"
-RDEPENDS_${PN} += "python-numbers"
-
-SRCNAME = "SQLAlchemy"
-SRC_URI = "https://pypi.python.org/packages/source/S/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "e3c8f836ea9b48886718f59b9d8646ff"
-SRC_URI[sha256sum] = "5fff261d0cff21c39913f9d30682659a52bfa2875699b2b7d908d0225df42a15"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-webob_1.2.3.bb b/meta-openstack/recipes-devtools/python/python-webob_1.2.3.bb
deleted file mode 100644
index a30ee9c..0000000
--- a/meta-openstack/recipes-devtools/python/python-webob_1.2.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "WSGI request and response object"
-HOMEPAGE = "http://webob.org/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5"
-
-PR = "r0"
-SRCNAME = "WebOb"
-
-SRC_URI = "http://pypi.python.org/packages/source/W/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "11825b7074ba7043e157805e4e6e0f55"
-SRC_URI[sha256sum] = "325c249f3ac35e72b75ba13b2c60317def0c986a24a413ebf700509ea4c73a13"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-RDEPENDS_${PN} += " \
-        python-sphinx \
-        python-nose \
-        "
-
diff --git a/meta-openstack/recipes-devtools/python/python-werkzeug_0.9.4.bb b/meta-openstack/recipes-devtools/python/python-werkzeug_0.9.4.bb
deleted file mode 100644
index 38e9f0f..0000000
--- a/meta-openstack/recipes-devtools/python/python-werkzeug_0.9.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "The Swiss Army knife of Python web development"
-HOMEPAGE = "https://pypi.python.org/pypi/Werkzeug/"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ad2e600a437b1b03d25b02df8c23ad1c"
-
-PR = "r0"
-SRCNAME = "Werkzeug"
-
-SRC_URI = "https://pypi.python.org/packages/source/W/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "670fad41f57c13b71a6816765765a3dd"
-SRC_URI[sha256sum] = "c1baf7a3e8be70f34d931ee173283f406877bd3d17f372bbe82318a5b3c510cc"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-io \
-                   python-datetime \
-                   python-email \
-                   python-zlib \
-                   python-pkgutil \
-                   python-html \
-                   python-shell \
-                   python-pprint \
-                   python-subprocess \
-                   python-netserver"
-
-CLEANBROKEN = "1"
-