Merge branch 'master' into kilo

5 files changed, 11 insertions, 4 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-fixtures_1.0.0.bb b/meta-openstack/recipes-devtools/python/python-fixtures_1.0.0.bb
index a3d6a34..fe1c8d1 100644
--- a/meta-openstack/recipes-devtools/python/python-fixtures_1.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-fixtures_1.0.0.bb
@@ -20,3 +20,5 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} \
     --prefix=${prefix} \
     --install-lib=${PYTHON_SITEPACKAGES_DIR} \
     --install-data=${datadir}"
+
+RDEPENDS_${PN} += "python-testtools"
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index e5896df..1f012cc 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -284,6 +284,8 @@ RDEPENDS_${PN} += " \
         python-pysaml2 \
         python-oslo.utils \
         python-oauthlib \
+        python-fixtures \
+        python-oslotest \
         "
 
 RDEPENDS_${SRCNAME}-tests += " bash"
diff --git a/meta-openstack/recipes-devtools/python/python-oslotest_1.4.0.bb b/meta-openstack/recipes-devtools/python/python-oslotest_1.4.0.bb
index edb37d8..b3819e4 100644
--- a/meta-openstack/recipes-devtools/python/python-oslotest_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslotest_1.4.0.bb
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 PR = "r0"
 SRCNAME = "oslotest"
 
-SRC_URI = "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-1.0.0.tar.gz \
+SRC_URI = "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
 "
 
-SRC_URI[md5sum] = "1f7710e4d38b615990737f813704fd58"
-SRC_URI[sha256sum] = "cf05f4ff0cbf84ad0b5d1bef7c46d719eaf4408107e65a32a4500cf707d1a1e7"
+SRC_URI[md5sum] = "a573e1943869f0841f487cf94a121321"
+SRC_URI[sha256sum] = "4226c044198792da7e14ca76895656e8d6e4b256eab184a6c81477b373e059a6"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -26,4 +26,5 @@ RDEPENDS_${PN} = "python-fixtures \
                   python-testtools \
                   python-mock \
                   python-mox \
+                  bash \
 "
diff --git a/meta-openstack/recipes-devtools/python/python-pyudev_0.16.1.bb b/meta-openstack/recipes-devtools/python/python-pyudev_0.16.1.bb
index dd83d87..384b1d8 100644
--- a/meta-openstack/recipes-devtools/python/python-pyudev_0.16.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-pyudev_0.16.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A libudev binding"
 HOMEPAGE = "http://pyudev.readthedocs.org/"
 SECTION = "devel/python"
-LICENSE = "LGPL 2.1"
+LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 PR = "r0"
diff --git a/meta-openstack/recipes-devtools/python/python-testtools_0.9.33.bb b/meta-openstack/recipes-devtools/python/python-testtools_0.9.33.bb
index 7e359b4..48663e9 100644
--- a/meta-openstack/recipes-devtools/python/python-testtools_0.9.33.bb
+++ b/meta-openstack/recipes-devtools/python/python-testtools_0.9.33.bb
@@ -16,3 +16,5 @@ SRC_URI[sha256sum] = "5b62231fea71ccb2361d48286481b198ccb8768bf81f8aaec1c8d5fb98
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+RDEPENDS_${PN} += "python-extras"