[m-c-s][PATCH 00/11] uprev horizon to latest stable/pike

[m-c-s][PATCH 00/11] uprev horizon to latest stable/pike

[Mark Asselstine]

As mentioned in my previous series the intention is to get horizon
updated first, this will allow for the initial framework to be worked
on with the intention of getting things back to a working state. With
this series we can move from raw uprevs to starting to get things
functional.

Mark

[m-c-s][PATCH 01/11] python-keystone: launch service via uwsgi

[Mark Asselstine]

The keystone-all has been removed upstream and all indication seem to
show that using uwsgi is the new approach to launching this service.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-keystone/keystone | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone b/meta-openstack/recipes-devtools/python/python-keystone/keystone
index 0d8a538..34cc3ad 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/keystone
+++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone
@@ -11,7 +11,8 @@
 ### END INIT INFO
 
 DESC="keystone"
-DAEMON="/usr/bin/keystone-all"
+DAEMON="uwsgi"
+DAEMON_OPTIONS="--http 127.0.0.1:35357 --wsgi-file $(which keystone-wsgi-admin)"
 PIDFILE="/var/run/keystone-all.pid"
 
 start ()
@@ -34,7 +35,7 @@ start ()
 
     start-stop-daemon --start --quiet --background \
         --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \
-	-- --log-dir=/var/log/keystone
+	-- ${DAEMON_OPTIONS}
 
     if [ $? -eq 0 ]; then
         echo "done."
-- 
2.7.4

[m-c-s][PATCH 02/11] python-ceilometerclient: uprev to latest stable/pike

[Mark Asselstine]

Drop old patches and update runtime dependency list.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../fix_ceilometerclient_memory_leak.patch         | 37 ----------------------
 .../python/python-ceilometerclient_git.bb          | 23 ++++++--------
 2 files changed, 9 insertions(+), 51 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch
deleted file mode 100644
index 8abc654..0000000
--- a/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
----
- ceilometerclient/openstack/common/apiclient/client.py |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/ceilometerclient/openstack/common/apiclient/client.py
-+++ b/ceilometerclient/openstack/common/apiclient/client.py
-@@ -90,6 +90,7 @@
-         self.user_agent = user_agent or self.user_agent
- 
-         self.times = []  # [("item", starttime, endtime), ...]
-+        self.times_max_len = 200
-         self.timings = timings
- 
-         # requests within the same session can reuse TCP connections from pool
-@@ -142,6 +143,12 @@
-     def reset_timings(self):
-         self.times = []
- 
-+    def get_timings_max_len(self):
-+        return self.times_max_len
-+
-+    def set_timings_max_len(self, new_len):
-+        self.times_max_len = new_len
-+
-     def request(self, method, url, **kwargs):
-         """Send an http request with the specified characteristics.
- 
-@@ -173,6 +180,9 @@
-         if self.timings:
-             self.times.append(("%s %s" % (method, url),
-                                start_time, time.time()))
-+            # remove oldest items until we maintain max length
-+            while len(self.times) > self.times_max_len:
-+                del self.times[0]
-         self._http_log_resp(resp)
- 
-         if resp.status_code >= 400:
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
index a830e51..0341cac 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
@@ -9,30 +9,25 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} +=" \
-        python-cliff \
-	python-httplib2 \
-	python-iso8601 \
-	python-prettytable \
-	python-pyparsing \
-	python-simplejson \
-	python-pbr \
+RDEPENDS_${PN} += " \
+        python-pbr \
+        python-iso8601 \
+        python-keystoneauth1 \
         python-oslo.i18n \
         python-oslo.serialization \
         python-oslo.utils \
-        python-keystoneclient \
+        python-prettytable \
         python-requests \
         python-six \
         python-stevedore \
-	"
+        "
 
 SRC_URI = "\
-	git://github.com/openstack/python-ceilometerclient.git;branch=master \
-	file://fix_ceilometerclient_memory_leak.patch \
+	git://github.com/openstack/python-ceilometerclient.git;branch=stable/pike \
 	"
 
-PV = "1.5.0+git${SRCPV}"
-SRCREV = "daed7e59c383f1ca74d75160cbc99fbd89675648"
+PV = "2.9.0+git${SRCPV}"
+SRCREV = "4ee321feeef39fa2a297ad8e58e931b8a03d8f14"
 S = "${WORKDIR}/git"
 
 inherit setuptools rmargparse
-- 
2.7.4

[m-c-s][PATCH 03/11] python-cinderclient: uprev to latest stable/pike

[Mark Asselstine]

Remove old patches and update runtime dependencies based on
requirements.txt

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../fix_cinderclient_memory_leak.patch             | 37 ----------------------
 .../python/python-cinderclient_git.bb              | 30 +++++++++---------
 2 files changed, 15 insertions(+), 52 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-cinderclient/fix_cinderclient_memory_leak.patch

diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient/fix_cinderclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-cinderclient/fix_cinderclient_memory_leak.patch
deleted file mode 100644
index 137edfd..0000000
--- a/meta-openstack/recipes-devtools/python/python-cinderclient/fix_cinderclient_memory_leak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
----
- cinderclient/openstack/common/apiclient/client.py |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/cinderclient/openstack/common/apiclient/client.py
-+++ b/cinderclient/openstack/common/apiclient/client.py
-@@ -90,6 +90,7 @@
-         self.user_agent = user_agent or self.user_agent
- 
-         self.times = []  # [("item", starttime, endtime), ...]
-+        self.times_max_len = 200
-         self.timings = timings
- 
-         # requests within the same session can reuse TCP connections from pool
-@@ -142,6 +143,12 @@
-     def reset_timings(self):
-         self.times = []
- 
-+    def get_timings_max_len(self):
-+        return self.times_max_len
-+
-+    def set_timings_max_len(self, new_len):
-+        self.times_max_len = new_len
-+
-     def request(self, method, url, **kwargs):
-         """Send an http request with the specified characteristics.
- 
-@@ -173,6 +180,9 @@
-         if self.timings:
-             self.times.append(("%s %s" % (method, url),
-                                start_time, time.time()))
-+            # remove oldest items until we maintain max length
-+            while len(self.times) > self.times_max_len:
-+                del self.times[0]
-         self._http_log_resp(resp)
- 
-         if resp.status_code >= 400:
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index e264694..bf76e9d 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -8,32 +8,32 @@ DEPENDS = "python-setuptools-git"
 SRCNAME = "python-cinderclient"
 
 SRC_URI = "\
-	git://github.com/openstack/python-cinderclient.git;branch=master \
-	file://fix_cinderclient_memory_leak.patch \
+	git://github.com/openstack/python-cinderclient.git;branch=stable/pike \
 	file://cinder-api-check.sh \
 	"
 
-PV="1.4.0+git${SRCPV}"
-SRCREV="c167dda40cc65fe437a12b815ef91bbde4efb6bb"
+PV="3.1.0+git${SRCPV}"
+SRCREV="3640aeab6e11987288a2f149fbeedb1c026045e2"
 S = "${WORKDIR}/git"
 
-inherit setuptools monitor rmargparse
+inherit setuptools monitor
 
 DEPENDS += " \
         python-pip \
         python-pbr \
         "
 
-RDEPENDS_${PN} += "python-prettytable \
-                   python-simplejson \
-                   python-requests \
-                   python-setuptools-git \
-                   python-pbr \
-                   python-keystoneclient \
-                   python-babel \
-                   python-six \
-	           "
-
+RDEPENDS_${PN} += " \
+        python-pbr \
+        python-prettytable \
+        python-keystoneauth1 \
+        python-simplejson \
+        python-babel \
+        python-six \
+        python-oslo.i18n \
+        python-oslo.utils \
+        "
+	
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
 
-- 
2.7.4

[m-c-s][PATCH 04/11] python-warlock: add v1.2.0 required by python-glanceclient

[Mark Asselstine]

Keep the newer v1.3.0 around but we need to ensure this version is in
use so set a PREF version.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 meta-openstack/conf/layer.conf                      |  1 +
 .../recipes-devtools/python/python-warlock_1.2.0.bb | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-warlock_1.2.0.bb

diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 6859085..f2aa64e 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -20,4 +20,5 @@ PREFERRED_VERSION_python-netaddr = "0.7.19"
 PREFERRED_VERSION_python-sqlalchemy = "1.0.16"
 PREFERRED_VERSION_python-requests = "2.13.0"
 PREFERRED_VERSION_python-eventlet = "0.20.0"
+PREFERRED_VERSION_python-warlock = "1.2.0"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-openstack/recipes-devtools/python/python-warlock_1.2.0.bb b/meta-openstack/recipes-devtools/python/python-warlock_1.2.0.bb
new file mode 100644
index 0000000..0839983
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-warlock_1.2.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Build self-validating python objects using JSON schemas"
+HOMEPAGE = "http://github.com/bcwaldon/warlock"
+SECTION = "devel/python"
+LICENSE = "Apache-2"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+DEPENDS += " \
+        python-jsonschema \
+        python-jsonpatch \
+        "
+
+SRC_URI[md5sum] = "8389225c589ada11a9094abc5d9053df"
+SRC_URI[sha256sum] = "7c0d17891e14cf77e13a598edecc9f4682a5bc8a219dc84c139c5ba02789ef5a"
+
+inherit setuptools pypi
+
+RDEPENDS_${PN} += " \
+        python-jsonschema \
+        python-jsonpatch \
+        python-six \
+        "
-- 
2.7.4

[m-c-s][PATCH 05/11] python-glanceclient: uprev to latest stable/pike

[Mark Asselstine]

Update runtime dependencies based on requirements.txt, drop old
patches. Required a downrev of python-warlock as this verison is not
compatible with v1.3.0.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../fix_glanceclient_memory_leak.patch             | 37 ----------------------
 .../python/python-glanceclient_git.bb              | 24 ++++++++------
 2 files changed, 15 insertions(+), 46 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-glanceclient/fix_glanceclient_memory_leak.patch

diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient/fix_glanceclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-glanceclient/fix_glanceclient_memory_leak.patch
deleted file mode 100644
index 754d83f..0000000
--- a/meta-openstack/recipes-devtools/python/python-glanceclient/fix_glanceclient_memory_leak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
----
- glanceclient/openstack/common/apiclient/client.py |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/glanceclient/openstack/common/apiclient/client.py
-+++ b/glanceclient/openstack/common/apiclient/client.py
-@@ -90,6 +90,7 @@
-         self.user_agent = user_agent or self.user_agent
- 
-         self.times = []  # [("item", starttime, endtime), ...]
-+        self.times_max_len = 200
-         self.timings = timings
- 
-         # requests within the same session can reuse TCP connections from pool
-@@ -142,6 +143,12 @@
-     def reset_timings(self):
-         self.times = []
- 
-+    def get_timings_max_len(self):
-+        return self.times_max_len
-+
-+    def set_timings_max_len(self, new_len):
-+        self.times_max_len = new_len
-+
-     def request(self, method, url, **kwargs):
-         """Send an http request with the specified characteristics.
- 
-@@ -173,6 +180,9 @@
-         if self.timings:
-             self.times.append(("%s %s" % (method, url),
-                                start_time, time.time()))
-+            # remove oldest items until we maintain max length
-+            while len(self.times) > self.times_max_len:
-+                del self.times[0]
-         self._http_log_resp(resp)
- 
-         if resp.status_code >= 400:
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index 22dc854..00ea2ab 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -9,12 +9,11 @@ DEPENDS += " \
         python-pbr \
         "
 
-SRCREV = "86635868c1eb3aec0c065c12cb9928c613940f36"
-PV = "1.1.0+git${SRCPV}"
+SRCREV = "13b25ff1fed908cfe7b4e719a97efd7121e3be96"
+PV = "2.8.0+git${SRCPV}"
 
 SRC_URI = "\
-	git://github.com/openstack/${BPN}.git;protocol=https \
-	file://fix_glanceclient_memory_leak.patch \
+	git://github.com/openstack/${BPN}.git;branch=stable/pike \
 	file://glance-api-check.sh \
 	"
 
@@ -29,13 +28,20 @@ DEPENDS += " \
     python-pbr-native \
     "
 
-RDEPENDS_${PN} = "gmp \
+RDEPENDS_${PN} += " \
+   gmp \
+   bash \
+   python-pbr \
+   python-babel \
+   python-prettytable \
+   python-keystoneauth1 \
+   python-requests \
    python-warlock \
+   python-six \
+   python-oslo.utils \
+   python-oslo.i18n \
+   python-wrapt \
    python-pyopenssl \
-   python-prettytable \
-   python-setuptools-git \
-   python-pbr \
-   bash \
    "
 
 MONITOR_CHECKS_${PN} += "\
-- 
2.7.4

[m-c-s][PATCH 06/11] python-osc-lib: uprev to v1.7.0

[Mark Asselstine]

This uprev is required for the uprev of python-neutronclient to
stable/pike.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../{python-osc-lib_1.1.0.bb => python-osc-lib_1.7.0.bb}    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-osc-lib_1.1.0.bb => python-osc-lib_1.7.0.bb} (63%)

diff --git a/meta-openstack/recipes-devtools/python/python-osc-lib_1.1.0.bb b/meta-openstack/recipes-devtools/python/python-osc-lib_1.7.0.bb
similarity index 63%
rename from meta-openstack/recipes-devtools/python/python-osc-lib_1.1.0.bb
rename to meta-openstack/recipes-devtools/python/python-osc-lib_1.7.0.bb
index 70582f7..64e1a17 100644
--- a/meta-openstack/recipes-devtools/python/python-osc-lib_1.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-osc-lib_1.7.0.bb
@@ -4,17 +4,10 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-SRCNAME = "osc-lib"
+SRC_URI[md5sum] = "8bae654318c8c82d341f7228cfa3ec2d"
+SRC_URI[sha256sum] = "7dee72f13e5478f8d3d836267fa019b99ed4d5e478fc08bbcc9e23029d11ec78"
 
-SRC_URI = "https://pypi.io/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "08bf2b46089da52240893d99a3892897"
-SRC_URI[sha256sum] = "e06ca111b2702d442f5cf70c754b6331cc7742231f0fe0b634cbd03c502610ba"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 RDEPENDS_${PN} += " \
         python-pbr \
-- 
2.7.4

[m-c-s][PATCH 07/11] python-cliff: uprev to v2.9.1

[Mark Asselstine]

This uprev is required for the uprev of python-neutronclient to
stable/pike.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../python/{python-cliff_2.4.0.bb => python-cliff_2.9.1.bb} | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-cliff_2.4.0.bb => python-cliff_2.9.1.bb} (62%)

diff --git a/meta-openstack/recipes-devtools/python/python-cliff_2.4.0.bb b/meta-openstack/recipes-devtools/python/python-cliff_2.9.1.bb
similarity index 62%
rename from meta-openstack/recipes-devtools/python/python-cliff_2.4.0.bb
rename to meta-openstack/recipes-devtools/python/python-cliff_2.9.1.bb
index 20518bb..e24c756 100644
--- a/meta-openstack/recipes-devtools/python/python-cliff_2.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-cliff_2.9.1.bb
@@ -4,16 +4,10 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCNAME = "cliff"
+SRC_URI[md5sum] = "2bb9bc906a0174afbc25f896484d215e"
+SRC_URI[sha256sum] = "ab50fbb4717c74e32915123f4150805b463e81de1d58e43996fd813b26c5b447"
 
-SRC_URI = "https://pypi.python.org/packages/5a/86/61cb36713a6feb28cfb3201022a218c359dc988cf9f65b2e2681cb33cf8d/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "26ef765d200e54aebf72984dfce5f255"
-SRC_URI[sha256sum] = "cc9175e3c2a42bc06343290a1218bc6b70f36883520b2948f743c5f9ae917675"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools rmargparse
+inherit setuptools pypi
 
 DEPENDS += "\
     python-pbr \
@@ -29,7 +23,6 @@ RDEPENDS_${PN} += "python-prettytable \
             python-pbr \
             python-pyparsing \
             python-prettytable \
-            python-pyparsing \
             python-six \
             python-stevedore \
             python-unicodecsv \
-- 
2.7.4

[m-c-s][PATCH 08/11] python-neutronclient: uprev to latest stable/pike

[Mark Asselstine]

Updated runtime dependencies based on requirements.txt. Required
updates to python-cliff and python-osc-lib.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../recipes-devtools/python/python-neutronclient_git.bb  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index bcbefaa..5904e64 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -9,28 +9,32 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} +="\
+RDEPENDS_${PN} += " \
         python-pbr \
         python-cliff \
+        python-debtcollector \
         python-iso8601 \
         python-netaddr \
+        python-osc-lib \
         python-oslo.i18n \
         python-oslo.serialization \
         python-oslo.utils \
-        python-requests \
+        python-os-client-config \
+        python-keystoneauth1 \
         python-keystoneclient \
+        python-requests \
         python-simplejson \
         python-six \
         python-babel \
-	"
+        "
 
-SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \
+SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=stable/pike \
            file://neutronclient-use-csv-flag-instead-of-json.patch \
            file://neutron-api-check.sh \
           "
 
-PV = "3.1.0+git${SRCPV}"
-SRCREV = "3e115991c1cf9ec7cf4252440fa8d6015a5f53ce"
+PV = "6.5.0+git${SRCPV}"
+SRCREV = "e145c4ef8a0e8390f0468df422a757760e77f823"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor rmargparse
-- 
2.7.4

[m-c-s][PATCH 09/11] python-novaclient: uprev to latest stable/pike

[Mark Asselstine]

Updated runtime dependencies based on requirements.txt.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../python/python-novaclient_git.bb                | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index 1456bbc..dd89458 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -5,12 +5,12 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"
 
 SRC_URI = "\
-	git://github.com/openstack/python-novaclient.git;branch=master \
+	git://github.com/openstack/python-novaclient.git;branch=stable/pike \
 	file://nova-api-check.sh \
 	"
 
-PV = "2.33.0+git${SRCPV}"
-SRCREV = "a5363ae0d60d41feff23f6cca44fcd7aa9fc5b8b"
+PV = "9.1.1+git${SRCPV}"
+SRCREV = "204eff6dc7b234d2807a6caa24a2fc58ebee520b"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor rmargparse
@@ -20,12 +20,18 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} += "python-iso8601 \
-	python-prettytable \
-	python-requests \
-	python-simplejson \
-	python-pbr \
-	"
+RDEPENDS_${PN} += " \
+        python-pbr \
+        python-keystoneauth1 \
+        python-iso8601 \
+        python-oslo.i18n \
+        python-oslo.serialization \
+        python-oslo.utils \
+        python-prettytable \
+        python-simplejson \
+        python-six \
+        python-babel \
+        "
 
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
-- 
2.7.4

[m-c-s][PATCH 10/11] python-xstatic-*: uprev to required versions

[Mark Asselstine]

The python-horizon requires specific versions of the various
python-xstatic-* per its requirements.txt file. Being 'xtatic'
packages these have no additional dependencies so the uprevs are
mostly straitforward version updates with a check that the license
hasn't changed.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 ....2.bb => python-xstatic-angular-bootstrap_2.2.0.0.bb} | 15 +++++----------
 ....0.2.bb => python-xstatic-angular-gettext_2.3.8.0.bb} | 13 +++++--------
 ...ular_1.3.7.0.bb => python-xstatic-angular_1.5.8.0.bb} | 15 +++++----------
 ...2.0.0.bb => python-xstatic-bootstrap-scss_3.3.7.1.bb} | 15 +++++----------
 ...h_3.3.5.3.bb => python-xstatic-bootswatch_3.3.7.0.bb} | 11 ++++-------
 ...tatic-d3_3.1.6.2.bb => python-xstatic-d3_3.5.17.0.bb} | 15 +++++----------
 ...4.3.0.0.bb => python-xstatic-font-awesome_4.7.0.0.bb} | 16 ++++++----------
 ...mine_2.1.2.0.bb => python-xstatic-jasmine_2.4.1.1.bb} | 14 +++++---------
 ...pt_2.0.0.2.bb => python-xstatic-jsencrypt_2.3.1.1.bb} | 15 +++++----------
 ....3.2.bb => python-xstatic-roboto-fontface_0.5.0.0.bb} | 13 +++++--------
 ...m.js_0.0.4.2.bb => python-xstatic-term.js_0.0.7.0.bb} | 15 +++++----------
 11 files changed, 55 insertions(+), 102 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-angular-bootstrap_0.11.0.2.bb => python-xstatic-angular-bootstrap_2.2.0.0.bb} (38%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-angular-gettext_2.1.0.2.bb => python-xstatic-angular-gettext_2.3.8.0.bb} (42%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-angular_1.3.7.0.bb => python-xstatic-angular_1.5.8.0.bb} (43%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-bootstrap-scss_3.2.0.0.bb => python-xstatic-bootstrap-scss_3.3.7.1.bb} (36%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-bootswatch_3.3.5.3.bb => python-xstatic-bootswatch_3.3.7.0.bb} (53%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-d3_3.1.6.2.bb => python-xstatic-d3_3.5.17.0.bb} (42%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-font-awesome_4.3.0.0.bb => python-xstatic-font-awesome_4.7.0.0.bb} (42%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-jasmine_2.1.2.0.bb => python-xstatic-jasmine_2.4.1.1.bb} (43%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-jsencrypt_2.0.0.2.bb => python-xstatic-jsencrypt_2.3.1.1.bb} (43%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-roboto-fontface_0.4.3.2.bb => python-xstatic-roboto-fontface_0.5.0.0.bb} (39%)
 rename meta-openstack/recipes-devtools/python/{python-xstatic-term.js_0.0.4.2.bb => python-xstatic-term.js_0.0.7.0.bb} (39%)

diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_0.11.0.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb
similarity index 38%
rename from meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_0.11.0.2.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb
index aac0fa7..1265e4b 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_0.11.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb
@@ -2,19 +2,14 @@ DESCRIPTION = "Angular JavaScript library packaged for setuptools"
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-Bootstrap"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=2e4ff6677f43e488434dd77116b7f7ff"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PR = "r0"
+PYPI_PACKAGE = "XStatic-Angular-Bootstrap"
 
-SRCNAME = "XStatic-Angular-Bootstrap"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "1d7d02580f022c36628f99fbf40e39c9"
+SRC_URI[sha256sum] = "61b0a86aad66bf0d333ed24496f51d77cb20ad5bf664140d86e880b15a231166"
 
-SRC_URI[md5sum] = "bac078c4e6496367677680c89162ee83"
-SRC_URI[sha256sum] = "cbe428bf04c000460776b521f6ace0455e9f3f20135499e9aa2f4af693dc7b3e"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 DEPENDS += " \
         python-pip \
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.1.0.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb
similarity index 42%
rename from meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.1.0.2.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb
index 0f270b2..d9c14a2 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.1.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb
@@ -2,17 +2,14 @@ DESCRIPTION = "Angular-Gettext javascript library packaged for setuptools (easy_
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-Gettext"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=46d1a7b9d85c18f6acc979ab4e2ae6d9"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRCNAME = "XStatic-Angular-Gettext"
-SRC_URI = "https://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+PYPI_PACKAGE = "XStatic-Angular-Gettext"
 
-SRC_URI[md5sum] = "371919adc1c6d6a45085f8a006b44efa"
-SRC_URI[sha256sum] = "c0745f433bb2f87d8222cdd65690c9089f5128c736309c3bc8d689aec39fa493"
+SRC_URI[md5sum] = "de55242cf5dc5fa712ac7e4a53aeb12b"
+SRC_URI[sha256sum] = "18db14dccaae5d64a9b66d08d0134b6c154fc1fb1e216964bba8e403e03c870e"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 DEPENDS += " \
         python-pip \
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.3.7.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb
similarity index 43%
rename from meta-openstack/recipes-devtools/python/python-xstatic-angular_1.3.7.0.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb
index 39e5e6c..360fbfc 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.3.7.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb
@@ -2,19 +2,14 @@ DESCRIPTION = "Angular JavaScript library packaged for setuptools"
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fef10afacf31c10c1fb9ce04e3763269"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PR = "r0"
+PYPI_PACKAGE = "XStatic-Angular"
 
-SRCNAME = "XStatic-Angular"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "15384e734161d31ff18a644f9632f25b"
+SRC_URI[sha256sum] = "b1dcdd7a66d3041625698bba2ac480ffc2447b05f551f10fcae2ac33139eb033"
 
-SRC_URI[md5sum] = "fa26884ab0b2acfa09e372aedd7e7b04"
-SRC_URI[sha256sum] = "7cad216b226399cbe8d2909ed5b9f28d724907b9c9e1e078e6e25d320a3d5dd7"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 # DEPENDS_default: python-pip
 
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.2.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb
similarity index 36%
rename from meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.2.0.0.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb
index 703bd71..b5d714e 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.2.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb
@@ -2,19 +2,14 @@ DESCRIPTION = "%DESCRIPTION%"
 HOMEPAGE = "%URL%"
 SECTION = "devel/python"
 LICENSE = "Apache-2"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=21ce610a6aa67eed6d6867db316597ee"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PR = "r0"
+PYPI_PACKAGE = "XStatic-Bootstrap-SCSS"
 
-SRCNAME = "XStatic-Bootstrap-SCSS"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "cc0d26647d10e1de84ba6649d3264f77"
+SRC_URI[sha256sum] = "4d388df037293163bf3242e0b60c79d06e1f743af8b0be8473f92676340e5acd"
 
-SRC_URI[md5sum] = "903d7de8aef6bee93d976b42d35edf7b"
-SRC_URI[sha256sum] = "7e9858737e2e6aac921ec7a3fca627e522901c3061611e154ebc0b8a892c7018"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 # DEPENDS_default: python-pip
 
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.5.3.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb
similarity index 53%
rename from meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.5.3.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb
index a0a0ecc..1b95871 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.5.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb
@@ -4,15 +4,12 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRCNAME = "XStatic-bootswatch"
-SRC_URI = "https://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+PYPI_PACKAGE = "XStatic-bootswatch"
 
-SRC_URI[md5sum] = "b7c76560828274bdcfee3f5e6fc5a147"
-SRC_URI[sha256sum] = "3c018cb0fdf591a520b2832a4ba8d8face633c765f29f9ccca8275b47be8aa94"
+SRC_URI[md5sum] = "422f09e076ff1741b76a9f7554ceca32"
+SRC_URI[sha256sum] = "93ee5863c1ec07212fe12ae137a10708b4102720391d460f061dd3f441ba3b6e"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 DEPENDS += " \
         python-pip \
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.1.6.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb
similarity index 42%
rename from meta-openstack/recipes-devtools/python/python-xstatic-d3_3.1.6.2.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb
index ee33537..2a7ae7d 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.1.6.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb
@@ -2,19 +2,14 @@ DESCRIPTION = "D3 JavaScript library packaged for setuptools"
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-D3"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0acf9e872391f112ea29deaa9fb0cab5"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PR = "r0"
+PYPI_PACKAGE = "XStatic-D3"
 
-SRCNAME = "XStatic-D3"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "2729f32f218b122999c26daeaf67a0a8"
+SRC_URI[sha256sum] = "176e93eee7192e07fc54334ddb1a6b64fcfc8cde6abb23f65727856bb9dd1829"
 
-SRC_URI[md5sum] = "835164e50cfbeb781a42e4d16f75a50c"
-SRC_URI[sha256sum] = "46fe521f8dad99f5e20f6702180510c37b81d11f1d78119d308fcec31381f90e"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 # DEPENDS_default: python-pip
 
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.3.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb
similarity index 42%
rename from meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.3.0.0.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb
index 4f90fbb..76ae529 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.3.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb
@@ -1,19 +1,15 @@
 DESCRIPTION = "Font Awesome icons packaged for setuptools (easy_install) / pip."
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Font-Awesome"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=821ae461252f11e98fefe8bdfaa130ca"
+LICENSE = "OFL-1.1"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/OFL-1.1;md5=fac3a519e5e9eb96316656e0ca4f2b90"
 
+PYPI_PACKAGE = "XStatic-Font-Awesome"
 
-SRCNAME = "XStatic-Font-Awesome"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "141a0e9a7e21e82f922573a00ae0c166"
+SRC_URI[sha256sum] = "e01fb480caaa7c7963dcb3328a4700e631bef6070db0e8b685816d220e685f6c"
 
-SRC_URI[md5sum] = "56e637fe7b3dcdd2ebd683996ad60759"
-SRC_URI[sha256sum] = "d2c0548990a22744ad20013e1d095de8ba1ea56b1878d8393a721205b03885c3"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 # DEPENDS_default: python-pip
 
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.1.2.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.4.1.1.bb
similarity index 43%
rename from meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.1.2.0.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.4.1.1.bb
index 529a2de..b68fb62 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.1.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.4.1.1.bb
@@ -2,18 +2,14 @@ DESCRIPTION = "Jasmine JavaScript library packaged for setuptools "
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Jasmine"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=eb6b9af5c233043f32ed0225d52cf4a4"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
+PYPI_PACKAGE = "XStatic-Jasmine"
 
-SRCNAME = "XStatic-Jasmine"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "9378ce965dfcb4ddb64855cc717d4ec8"
+SRC_URI[sha256sum] = "d1e8bf3c0e1cf683cc2c0aad95f197e9e51ea747fb91291445223a2b7dbc4740"
 
-SRC_URI[md5sum] = "63fdb4a8668eb70ceef1a311e8b02dcb"
-SRC_URI[sha256sum] = "ba80ab9a324a7abfa5bb4855aaca279aceaf3e0223830d28a17a994770ecc1b4"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 # DEPENDS_default: python-pip
 
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.0.0.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb
similarity index 43%
rename from meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.0.0.2.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb
index a891f5c..3ddcd89 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.0.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb
@@ -2,19 +2,14 @@ DESCRIPTION = "JSEncrypt JavaScript library packaged for setuptools"
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JSEncrypt"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=42bc00ba34391939fc6c1f4898c187b3"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PR = "r0"
+PYPI_PACKAGE = "XStatic-JSEncrypt"
 
-SRCNAME = "XStatic-JSEncrypt"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "4b03331d4b2f6c12e2e4b8ee6056bda0"
+SRC_URI[sha256sum] = "a277912a4f70d1d2f58c8d94b992d244e69fcf851a2cbed5d83cb4fc422a72f2"
 
-SRC_URI[md5sum] = "a2a24f2990500d6709643c3413dd93f8"
-SRC_URI[sha256sum] = "5852892afc6f80c7848f4110b6dad190a54aeb908271d67aaeae9d966f4a26b5"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 # DEPENDS_default: python-pip
 
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.4.3.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb
similarity index 39%
rename from meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.4.3.2.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb
index cba2389..3c828b4 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.4.3.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb
@@ -2,17 +2,14 @@ DESCRIPTION = "A simple package providing the Roboto fontface."
 HOMEPAGE = "https://github.com/choffmeister/roboto-fontface-bower"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=7eeeb6915ae97fbbac6282f36b6fcaaa"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-SRCNAME = "XStatic-roboto-fontface"
-SRC_URI = "https://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+PYPI_PACKAGE = "XStatic-roboto-fontface"
 
-SRC_URI[md5sum] = "2a19734d8e08bbe1413f37e703e288f8"
-SRC_URI[sha256sum] = "e539aa991300d8ee09ee557d3cab1066237806e365ceaf868084777379e307a5"
+SRC_URI[md5sum] = "32273ba68fa063623461db0b0767524f"
+SRC_URI[sha256sum] = "6d272df58e20eec3a15bca279163f38614c7074e2fecb537a58b29d109e83f62"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 DEPENDS += " \
         python-pip \
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.4.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb
similarity index 39%
rename from meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.4.2.bb
rename to meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb
index 79221c0..ef37760 100644
--- a/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.4.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb
@@ -2,19 +2,14 @@ DESCRIPTION = "Angular JavaScript library packaged for setuptools"
 HOMEPAGE = "https://pypi.python.org/pypi/XStatic-term.js/0.0.4.2"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0d4ffb2adc6dcb63bbd77832cf91447e"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PR = "r0"
+PYPI_PACKAGE = "XStatic-term.js"
 
-SRCNAME = "XStatic-term.js"
-SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "7434ecf6f5680c293cf3806245dc946b"
+SRC_URI[sha256sum] = "b5f3ab69cb638391f04254913a11b2aab08e2d51c5b81bb6a564c5a6d442bd31"
 
-SRC_URI[md5sum] = "2224354fa1d98599d9383df5b2e749b7"
-SRC_URI[sha256sum] = "1ed5c1cd4de60d6f290a032bfc7cdc4261d8d36cb7788b2b0a610551bbda15ec"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit setuptools pypi
 
 DEPENDS += " \
         python-pip \
-- 
2.7.4

[m-c-s][PATCH 11/11] python-horizon: uprev to latest stable/pike

[Mark Asselstine]

Required version updates to satisfy requirements.txt:

python-xstatic-angular, python-xstatic-angular-bootstrap,
python-xstatic-angular-gettext, python-xstatic-bootstrap-scss,
python-xstatic-bootswatch, python-xstatic-d3,
python-xstatic-font-awesome, python-xstatic-jasmine,
python-xstatic-jsencrypt, python-xstatic-roboto-fontface,
python-xstatic-term.js.

As well as the openstack *-clients. These uprev's have been completed
in commit prior to this one.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../recipes-devtools/python/python-horizon_git.bb  | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index d2cb345..69d19f5 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -18,10 +18,8 @@ RDEPENDS_${PN} += " \
         python-django-compressor \
         python-django-openstack-auth \
         python-django-pyscss \
-        python-eventlet \
-        python-httplib2 \
+        python-futurist \
         python-iso8601 \
-        python-kombu \
         python-netaddr \
         python-oslo.concurrency \
         python-oslo.config \
@@ -29,25 +27,27 @@ RDEPENDS_${PN} += " \
         python-oslo.policy \
         python-oslo.serialization \
         python-oslo.utils \
+        python-osprofiler \
+        python-pymongo \
         python-pyscss \
-        python-ceilometerclient \
         python-cinderclient \
         python-glanceclient \
         python-heatclient \
         python-keystoneclient \
         python-neutronclient \
         python-novaclient \
-        python-saharaclient \
         python-swiftclient \
-        python-troveclient \
         python-pytz \
         python-pyyaml \
+        python-semantic-version \
         python-six \
         python-xstatic \
         python-xstatic-angular \
         python-xstatic-angular-bootstrap \
+        python-xstatic-angular-fileupload \
         python-xstatic-angular-gettext \
         python-xstatic-angular-lrdragndrop \
+        python-xstatic-angular-schema-form \
         python-xstatic-bootstrap-datepicker \
         python-xstatic-bootstrap-scss \
         python-xstatic-bootswatch \
@@ -57,22 +57,23 @@ RDEPENDS_${PN} += " \
         python-xstatic-jasmine \
         python-xstatic-jquery \
         python-xstatic-jquery-migrate \
-        python-xstatic-jquery-quicksearch \
-        python-xstatic-jquery-tablesorter \
+        python-xstatic-jquery.quicksearch \
+        python-xstatic-jquery.tablesorter \
         python-xstatic-jquery-ui \
         python-xstatic-jsencrypt \
-        python-xstatic-magic-search \
         python-xstatic-mdi \
+        python-xstatic-objectpath \
         python-xstatic-rickshaw \
         python-xstatic-roboto-fontface \
         python-xstatic-smart-table \
         python-xstatic-spin \
         python-xstatic-term.js \
+        python-xstatic-tv4 \
         "
 
 SRCNAME = "horizon"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \
     file://horizon.init \
     file://fix_bindir_path.patch \
     file://openstack-dashboard-apache.conf \
@@ -80,8 +81,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://horizon-use-full-package-path-to-test-directories.patch \
     "
 
-SRCREV = "593f0b78eea8efbb6d833d66acc7ab4dc852159b"
-PV = "8.0.0+git${SRCPV}"
+SRCREV = "246ff9f81248a00a434e66d18fad70519ba811cc"
+PV = "12.0.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d python-dir default_configs monitor
-- 
2.7.4

Re: [m-c-s][PATCH 00/11] uprev horizon to latest stable/pike

[Bruce Ashfield]

On 2017-11-13 2:32 PM, Mark Asselstine wrote:
> As mentioned in my previous series the intention is to get horizon
> updated first, this will allow for the initial framework to be worked
> on with the intention of getting things back to a working state. With
> this series we can move from raw uprevs to starting to get things
> functional.

merged

Bruce

> 
> Mark
> 
>