[meta-cloud-services][fido-kilo][PATCH 00/42] Updates for fido-kilo

[meta-cloud-services][fido-kilo][PATCH 00/42] Updates for fido-kilo

[Josep Puigdemont]

Hi,

A few comments on this patch series:

* It contains several cherry-picks from master that are also needed in
fido-kilo.

* I had to cherry-pick django-pyscss 2.0.2 from master, although Kilo's
requirements have a cap on this package (>=1.0.3,<2.0.0), but horizon
wouldn't work otherwise.

* There are also a few upgrades to Openstack Kilo 2015.1.2 that were missing
from the previous series (and a new recipe for oslo.versionedobjects).

* Various dependencies have been added, and NAT as well as TUN kernel modules
are added to the compute image too.

* The last pacth is the only one I think may be a bit controversial (because
it's rather ugly). Maybe you have some suggestions on how to solve the issue
described in the commit message. I have put everything in one patch so it is
easy to remove later, or to discard altogether. Without this patch the images
won't work out of the box, but it can be fixed by adding a simple sed command
to IMAGE_POSTPROCESS_COMMAND that does the same.


I have tested this using both the AIO image and comupte+controller images
on qemu. Only the AIO image has been tested on real HW.

I'm sorry for the large patch sets! I believe this is the last series for
fido-kilo I have. I hope I can work with master and Liberty pretty soon.

Thanks,

/Josep

Jackie Huang (8):
  python-pathlib: add new recipe
  python-django-pyscss: add missing rdepends on python-pathlib
  python-enum: add new recipe
  python-pyscss: add missing rdepends on python-enum
  python-repoze.lru: add new recipe
  python-routes: add rdepends on python-repoze.lru
  python-nova: add missing rdepends
  python-eventlet: upgrade 0.17.1 -> 0.17.4

Josep Puigdemont (12):
  python-sqlalchemy-migrate: depends on sqlparse
  python-cliff: Fix object has no attribute debug error
  python-nova: dependency on blkid
  yocto-kernel: enable NAT
  python-pbr: upgrade to 0.11
  python-novaclient: upgrade to 2.23.2
  python-ceilometer: upgrade to 2015.1.2
  python-oslo.versionedobjects: added recipe
  python-heat: update to 2015.1.2
  packagegroup-cloud-compute: add tun kernel module
  packagegroup-cloud-extras: include xterm only if x11 in
    DISTRO_FEATURES
  Remove argparse from requirements.txt of some modules

Lei Maohui (3):
  python-beautifulsoup4: upgrade 4.3.2 -> 4.4.0
  python-sqlalchemy-migrate: upgrade 0.9.6->0.9.7
  python-testtools: upgrade 0.9.33 -> 1.8.0

Li xin (10):
  python-setuptools-git: add native support
  python-httpretty: upgrade 0.8.7 -> 0.8.10
  python-jsonpatch: upgrade 1.9 -> 1.11
  python-jsonpointer: upgrade 1.7 -> 1.9
  python-msgpack: upgrade 0.4.5 -> 0.4.6
  python-pecan: upgrade 0.8.3 -> 0.9.0
  json: upgrade 1.8.1 -> 1.8.3
  ruby.bbclass: Error fix
  python-vcversioner: add new recipe
  python-jsonschema: upgrade 2.4.0 -> 2.5.1

Mark Asselstine (9):
  python-nova: add missing dependency on sqlparse
  meta-openstack: add wildcard to libvirt bbappend
  libvirt: remove sanlock from PACKAGECONFIG
  glance: add new dependencies
  keystone: the 'sql' section is deprecated
  python-testtools: fix build error
  keystone: add missing functools32 module
  django-pyscss: uprev to version 2.0.2
  openvswitch: add as RRECOMMENDS for compute and controller

 meta-openstack/classes/ruby.bbclass                |  1 +
 ...up4_4.3.2.bb => python-beautifulsoup4_4.4.0.bb} |  6 ++--
 .../python/python-ceilometer_git.bb                |  7 ++---
 .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
 .../python/python-cinderclient_git.bb              |  3 +-
 ...1-Fix-object-has-no-attribute-debug-error.patch | 32 ++++++++++++++++++++++
 .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
 .../recipes-devtools/python/python-cliff_1.10.0.bb |  6 ++--
 ...scss_1.0.6.bb => python-django-pyscss_2.0.2.bb} |  6 ++--
 .../recipes-devtools/python/python-enum_0.4.4.bb   | 25 +++++++++++++++++
 ...ventlet_0.17.1.bb => python-eventlet_0.17.4.bb} |  5 ++--
 .../python/python-functools32_3.2.3-2.bb           | 29 ++++++++++++++++++++
 .../recipes-devtools/python/python-glance_git.bb   |  3 ++
 .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
 .../python/python-glanceclient_git.bb              |  1 +
 .../recipes-devtools/python/python-heat_git.bb     |  8 +++---
 ...tpretty_0.8.7.bb => python-httpretty_0.8.10.bb} |  4 +--
 ...n-jsonpatch_1.9.bb => python-jsonpatch_1.11.bb} |  4 +--
 ...sonpointer_1.7.bb => python-jsonpointer_1.9.bb} |  4 +--
 ...nschema_2.4.0.bb => python-jsonschema_2.5.1.bb} |  6 ++--
 .../python/python-keystone/keystone.conf           |  2 +-
 .../recipes-devtools/python/python-keystone_git.bb |  1 +
 .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
 .../python/python-keystoneclient_git.bb            |  1 +
 ...on-msgpack_0.4.5.bb => python-msgpack_0.4.6.bb} |  4 +--
 .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
 .../python/python-neutronclient_git.bb             |  3 +-
 .../recipes-devtools/python/python-nova_git.bb     |  8 +++++-
 .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
 .../python/python-novaclient_git.bb                |  9 +++---
 .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
 .../python/python-oslo.config_1.9.3.bb             |  4 +--
 .../python/python-oslo.versionedobjects_0.1.1.bb   | 26 ++++++++++++++++++
 .../python/python-pathlib_1.0.1.bb                 | 29 ++++++++++++++++++++
 .../{python-pbr_0.10.8.bb => python-pbr_0.11.0.bb} |  8 ++----
 ...python-pecan_0.8.3.bb => python-pecan_0.9.0.bb} |  4 +--
 .../recipes-devtools/python/python-pyscss_1.3.4.bb |  1 +
 .../python/python-repoze.lru_0.6.bb                | 20 ++++++++++++++
 .../python/python-routes_1.12.3.bb                 |  2 +-
 .../python/python-semantic-version_2.4.2.bb        | 27 ++++++++++++++++++
 .../python/python-setuptools-git_1.1.bb            |  1 +
 ...0.9.6.bb => python-sqlalchemy-migrate_0.9.7.bb} |  5 ++--
 .../python/python-sqlparse_0.1.16.bb               | 27 ++++++++++++++++++
 .../Remove-argparse-from-requirements.txt.patch    | 23 ++++++++++++++++
 .../python/python-stevedore_1.3.0.bb               |  2 ++
 ...sttools_0.9.33.bb => python-testtools_1.8.0.bb} |  8 ++++--
 .../python/python-vcversioner_2.14.0.0.bb          | 16 +++++++++++
 .../ruby/json/0001-Dont-compile-extensions.patch   | 20 --------------
 meta-openstack/recipes-devtools/ruby/json_git.bb   |  5 ++--
 ...ibvirt_1.2.12.bbappend => libvirt_1.%.bbappend} |  2 +-
 .../packagegroups/packagegroup-cloud-compute.bb    |  2 ++
 .../packagegroups/packagegroup-cloud-controller.bb |  1 +
 .../packagegroups/packagegroup-cloud-extras.bb     |  2 +-
 .../recipes-kernel/linux/linux-yocto/nf.cfg        |  1 +
 54 files changed, 510 insertions(+), 79 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-beautifulsoup4_4.3.2.bb => python-beautifulsoup4_4.4.0.bb} (71%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-cliff/0001-Fix-object-has-no-attribute-debug-error.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
 rename meta-openstack/recipes-devtools/python/{python-django-pyscss_1.0.6.bb => python-django-pyscss_2.0.2.bb} (77%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb
 rename meta-openstack/recipes-devtools/python/{python-eventlet_0.17.1.bb => python-eventlet_0.17.4.bb} (71%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-functools32_3.2.3-2.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
 rename meta-openstack/recipes-devtools/python/{python-httpretty_0.8.7.bb => python-httpretty_0.8.10.bb} (78%)
 rename meta-openstack/recipes-devtools/python/{python-jsonpatch_1.9.bb => python-jsonpatch_1.11.bb} (77%)
 rename meta-openstack/recipes-devtools/python/{python-jsonpointer_1.7.bb => python-jsonpointer_1.9.bb} (76%)
 rename meta-openstack/recipes-devtools/python/{python-jsonschema_2.4.0.bb => python-jsonschema_2.5.1.bb} (70%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
 rename meta-openstack/recipes-devtools/python/{python-msgpack_0.4.5.bb => python-msgpack_0.4.6.bb} (74%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_0.1.1.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb
 rename meta-openstack/recipes-devtools/python/{python-pbr_0.10.8.bb => python-pbr_0.11.0.bb} (73%)
 rename meta-openstack/recipes-devtools/python/{python-pecan_0.8.3.bb => python-pecan_0.9.0.bb} (80%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-repoze.lru_0.6.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb
 rename meta-openstack/recipes-devtools/python/{python-sqlalchemy-migrate_0.9.6.bb => python-sqlalchemy-migrate_0.9.7.bb} (78%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-sqlparse_0.1.16.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
 rename meta-openstack/recipes-devtools/python/{python-testtools_0.9.33.bb => python-testtools_1.8.0.bb} (72%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb
 delete mode 100644 meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
 rename meta-openstack/recipes-extended/libvirt/{libvirt_1.2.12.bbappend => libvirt_1.%.bbappend} (93%)

-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 01/42] python-pathlib: add new recipe

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

It's required by python-django-pyscss.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-pathlib_1.0.1.bb                 | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb

diff --git a/meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb b/meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb
new file mode 100644
index 0000000..ae26da1
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Object-oriented filesystem paths"
+DESCRIPTION = "pathlib offers a set of classes to handle filesystem paths. \
+It offers the following advantages over using string objects: \
+- No more cumbersome use of os and os.path functions. \
+- Embodies the semantics of different path types. \
+- Well-defined semantics, eliminating any warts or ambiguities. \
+"
+HOMEPAGE = "https://pypi.python.org/pypi/pathlib"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b6557c860f0fc867aeab30afd649753"
+
+
+SRCNAME = "pathlib"
+SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "5099ed48be9b1ee29b31c82819240537"
+SRC_URI[sha256sum] = "6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+DEPENDS += " \
+        python-pip \
+"
+
+RDEPENDS_${PN} += " \
+"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 02/42] python-django-pyscss: add missing rdepends on python-pathlib

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

Add missing rdepends on python-pathlib or it fails with:
  File "/usr/lib64/python2.7/site-packages/django_pyscss/compiler.py", line 4, in <module>
    from pathlib import PurePath
  ImportError: No module named pathlib

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb b/meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb
index 4261f71..f05018a 100644
--- a/meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb
+++ b/meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb
@@ -26,4 +26,5 @@ DEPENDS += " \
 RDEPENDS_${PN} += " \
         python-django \
         python-pyscss \        
+        python-pathlib \
         "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 03/42] python-nova: add missing dependency on sqlparse

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

Attempting to use nova-manage, for example to perform 'service list',
will result in a python trace indicating that the sqlparse module was
not found. Add the python-sqlparse recipe and include it in the
RDEPENDS list for nova.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>

Conflicts:
	meta-openstack/recipes-devtools/python/python-nova_git.bb
---
 .../recipes-devtools/python/python-nova_git.bb     |  1 +
 .../python/python-sqlparse_0.1.16.bb               | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-sqlparse_0.1.16.bb

diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 79fad92..8bfcbea 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -323,6 +323,7 @@ RDEPENDS_${PN} = " libvirt \
 		   python-rfc3986 \
 		   python-oslo.i18n \
 		   python-psutil \
+		   python-sqlparse \
     "
 
 RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \
diff --git a/meta-openstack/recipes-devtools/python/python-sqlparse_0.1.16.bb b/meta-openstack/recipes-devtools/python/python-sqlparse_0.1.16.bb
new file mode 100644
index 0000000..8ea99d7
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-sqlparse_0.1.16.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Non-validating SQL parser module"
+HOMEPAGE = "http://pypi.python.org/pypi/sqlparse"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=13ec2f893997ca1f516b55496e019a81"
+
+SRCNAME = "sqlparse"
+SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "370962a307ebaaa70a28b6b0ccb53980"
+SRC_URI[sha256sum] = "678c6c36ca4b01405177da8b84eecf92ec92c9f6c762396c965bb5d305f20f81"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+export BUILD_SYS
+export HOST_SYS
+
+inherit setuptools
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 04/42] python-enum: add new recipe

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

It's required by python-pyscss.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-enum_0.4.4.bb   | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb

diff --git a/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb b/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb
new file mode 100644
index 0000000..4671a59
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Robust enumerated type support in Python"
+DESCRIPTION = "This package provides a module for robust enumerations in Python."
+HOMEPAGE = "https://pypi.python.org/pypi/enum"
+SECTION = "devel/python"
+LICENSE = "GPLv2 | PSFv2"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=4325afd396febcb659c36b49533135d4 \
+                    file://LICENSE.PSF;md5=1ad8a43fc3bbfea1585223c99f4c3e6f \
+"
+
+SRCNAME = "enum"
+SRC_URI = "http://pypi.python.org/packages/source/e/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "ce75c7c3c86741175a84456cc5bd531e"
+SRC_URI[sha256sum] = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+DEPENDS += " \
+        python-pip \
+"
+
+RDEPENDS_${PN} += " \
+"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 05/42] python-pyscss: add missing rdepends on python-enum

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

Add missing rdepends on python-enum or it fails with:
  File "/usr/lib64/python2.7/site-packages/scss/compiler.py", line 7, in <module>
    from enum import Enum
  ImportError: No module named enum

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb b/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb
index f26352a..72ea639 100644
--- a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb
+++ b/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb
@@ -25,6 +25,7 @@ DEPENDS += " \
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
+        python-enum \
         "
 
 CLEANBROKEN = "1"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 06/42] python-repoze.lru: add new recipe

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

It's required by python-routes.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-repoze.lru_0.6.bb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-repoze.lru_0.6.bb

diff --git a/meta-openstack/recipes-devtools/python/python-repoze.lru_0.6.bb b/meta-openstack/recipes-devtools/python/python-repoze.lru_0.6.bb
new file mode 100644
index 0000000..60a749f
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-repoze.lru_0.6.bb
@@ -0,0 +1,20 @@
+SUMMARY = "A tiny LRU cache implementation and decorator"
+DESCRIPTION = "repoze.lru is a LRU (least recently used) cache implementation. \
+Keys and values that are not used frequently will be evicted from the cache faster \
+than keys and values that are used frequently. \
+"
+HOMEPAGE = "https://pypi.python.org/pypi/repoze.lru"
+SECTION = "devel/python"
+LICENSE = "BSD-derived"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2c33cdbc6bc9ae6e5d64152fdb754292"
+
+SRCNAME = "repoze.lru"
+
+SRC_URI = "http://pypi.python.org/packages/source/r/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "2c3b64b17a8e18b405f55d46173e14dd"
+SRC_URI[sha256sum] = "0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 07/42] python-routes: add rdepends on python-repoze.lru

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

Add the missing rdepends on python-repoze.lru or it will fail with:

  File "/usr/lib64/python2.7/site-packages/routes/mapper.py", line 5, in <module>
    from repoze.lru import LRUCache
  ImportError: No module named repoze.lru

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-routes_1.12.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python-routes_1.12.3.bb b/meta-openstack/recipes-devtools/python/python-routes_1.12.3.bb
index a966fad..a3f09c5 100644
--- a/meta-openstack/recipes-devtools/python/python-routes_1.12.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-routes_1.12.3.bb
@@ -16,4 +16,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-
+RDEPENDS_${PN} += "python-repoze.lru"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 08/42] python-nova: add missing rdepends

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

Add the missing rdepends on python-oslo.log, python-psutil
and python-amqp or it fails with:

  File "/usr/lib64/python2.7/site-packages/nova/cmd/compute.py", line 23, in <module>
    from oslo_log import log as logging
  ImportError: No module named oslo_log

  File "/usr/lib64/python2.7/site-packages/nova/openstack/common/report/generators/process.py", line 23, in <module>
    import psutil
  ImportError: No module named psutil

  File "/usr/lib64/python2.7/site-packages/stevedore/driver.py", line 50, in _default_on_load_failure
    raise err
  ImportError: No module named amqp

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-nova_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 8bfcbea..4af1ded 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -277,6 +277,7 @@ RDEPENDS_${PN} = " libvirt \
 		   python-keystonemiddleware \
 		   python-modules \
 		   python-misc \
+		   python-amqp \
 		   python-amqplib \
 		   python-anyjson \
 		   python-babel \
@@ -300,9 +301,11 @@ RDEPENDS_${PN} = " libvirt \
 		   python-oslo.concurrency \
 		   python-oslo.middleware \
 		   python-oslo.context \
+		   python-oslo.log \
 		   python-paste \
 		   python-pastedeploy \
 		   python-paramiko \
+		   python-psutil \
 		   python-pyasn1 \
 		   python-setuptools-git \
 		   python-simplejson \
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 09/42] python-setuptools-git: add native support

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-setuptools-git_1.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.1.bb b/meta-openstack/recipes-devtools/python/python-setuptools-git_1.1.bb
index 9447744..61408c3 100644
--- a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-setuptools-git_1.1.bb
@@ -19,3 +19,4 @@ inherit setuptools
 do_install_append() {
 	rm -f ${D}${libdir}/python*/site-packages/site.py*
 }
+BBCLASSEXTEND = "native"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 10/42] python-beautifulsoup4: upgrade 4.3.2 -> 4.4.0

[Josep Puigdemont]

From: Lei Maohui <leimaohui@cn.fujitsu.com>

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 ...ython-beautifulsoup4_4.3.2.bb => python-beautifulsoup4_4.4.0.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-beautifulsoup4_4.3.2.bb => python-beautifulsoup4_4.4.0.bb} (71%)

diff --git a/meta-openstack/recipes-devtools/python/python-beautifulsoup4_4.3.2.bb b/meta-openstack/recipes-devtools/python/python-beautifulsoup4_4.4.0.bb
similarity index 71%
rename from meta-openstack/recipes-devtools/python/python-beautifulsoup4_4.3.2.bb
rename to meta-openstack/recipes-devtools/python/python-beautifulsoup4_4.4.0.bb
index 2d3cddb..0b67b80 100644
--- a/meta-openstack/recipes-devtools/python/python-beautifulsoup4_4.3.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-beautifulsoup4_4.4.0.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "Screen-scraping library"
 HOMEPAGE = "https://pypi.python.org/pypi/beautifulsoup4/"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=83e365dc17176bd72ba7d08ca0555efa"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=39dacabe5494f61c8680f6fa7323b596"
 
 PR = "r0"
 SRCNAME = "beautifulsoup4"
 
 SRC_URI = "https://pypi.python.org/packages/source/b/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "b8d157a204d56512a4cc196e53e7d8ee"
-SRC_URI[sha256sum] = "a2b29bd048ca2fe54a046b29770964738872a9747003a371344a93eedf7ad58e"
+SRC_URI[md5sum] = "63d1f33e6524f408cb6efbc5da1ae8a5"
+SRC_URI[sha256sum] = "fad91da88f69438b9ba939ab1b2cabaa31b1d914f1cccb4bb157a993ed2917f6"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 11/42] python-eventlet: upgrade 0.17.1 -> 0.17.4

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

(From: ba3e02f and 8a676f4, squashed)

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/{python-eventlet_0.17.1.bb => python-eventlet_0.17.4.bb}  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-eventlet_0.17.1.bb => python-eventlet_0.17.4.bb} (71%)

diff --git a/meta-openstack/recipes-devtools/python/python-eventlet_0.17.1.bb b/meta-openstack/recipes-devtools/python/python-eventlet_0.17.4.bb
similarity index 71%
rename from meta-openstack/recipes-devtools/python/python-eventlet_0.17.1.bb
rename to meta-openstack/recipes-devtools/python/python-eventlet_0.17.4.bb
index b566649..32494e1 100644
--- a/meta-openstack/recipes-devtools/python/python-eventlet_0.17.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-eventlet_0.17.4.bb
@@ -4,13 +4,12 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778"
 
-PR = "r0"
 SRCNAME = "eventlet"
 
 SRC_URI = "http://pypi.python.org/packages/source/e/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "b66053e6dbfd5a6996750fa09b0af6ba"
-SRC_URI[sha256sum] = "de9c23eb94e55150b25150822a28f91656028987353fef3f687cc285d018dd5a"
+SRC_URI[md5sum] = "fea0993b14cc7322f944bdd535c4f24a"
+SRC_URI[sha256sum] = "8721e9714eaff8d20f2407e0d3a80069db6b57c9226c26ee9db25c541d06556d"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 12/42] python-sqlalchemy-migrate: upgrade 0.9.6->0.9.7

[Josep Puigdemont]

From: Lei Maohui <leimaohui@cn.fujitsu.com>

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 ...sqlalchemy-migrate_0.9.6.bb => python-sqlalchemy-migrate_0.9.7.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-sqlalchemy-migrate_0.9.6.bb => python-sqlalchemy-migrate_0.9.7.bb} (81%)

diff --git a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.6.bb b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb
similarity index 81%
rename from meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.6.bb
rename to meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb
index c64855b..32ecdb3 100644
--- a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.6.bb
+++ b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb
@@ -8,8 +8,8 @@ SRCNAME = "sqlalchemy-migrate"
 
 SRC_URI = "https://pypi.python.org/packages/source/s/sqlalchemy-migrate/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "1cdb4583dc30c436c4a060d08c764632"
-SRC_URI[sha256sum] = "c2c73d8dbeb29a96459d8622e3bac2e97cf6f74ed0564469486fe7ffe0ef3d97"
+SRC_URI[md5sum] = "fd586f77b25f905d56d1847fc1f9c68b"
+SRC_URI[sha256sum] = "a6adc1c9593e4a4c824230375ce18a887e28e1e9bb5374f5996b58879519f4e5"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 13/42] meta-openstack: add wildcard to libvirt bbappend

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

This is currently a dangling bbappend as libvirt is now version
1.2.15. The content of the file appears to still be relevant so simply
renaming this bbappend to apply to a range of releases. This will
throw a warning as no 'sanlock' PKGCONFIG currently exists in the base
recipe, a commit will be sent for meta-virtualizaiton to add this.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../libvirt/{libvirt_1.2.12.bbappend => libvirt_1.%.bbappend}             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-openstack/recipes-extended/libvirt/{libvirt_1.2.12.bbappend => libvirt_1.%.bbappend} (100%)

diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend
similarity index 100%
rename from meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend
rename to meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 14/42] python-httpretty: upgrade 0.8.7 -> 0.8.10

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/{python-httpretty_0.8.7.bb => python-httpretty_0.8.10.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-httpretty_0.8.7.bb => python-httpretty_0.8.10.bb} (78%)

diff --git a/meta-openstack/recipes-devtools/python/python-httpretty_0.8.7.bb b/meta-openstack/recipes-devtools/python/python-httpretty_0.8.10.bb
similarity index 78%
rename from meta-openstack/recipes-devtools/python/python-httpretty_0.8.7.bb
rename to meta-openstack/recipes-devtools/python/python-httpretty_0.8.10.bb
index 740c4ca..a6d622e 100644
--- a/meta-openstack/recipes-devtools/python/python-httpretty_0.8.7.bb
+++ b/meta-openstack/recipes-devtools/python/python-httpretty_0.8.10.bb
@@ -13,8 +13,8 @@ SRCNAME = "httpretty"
 SRC_URI = "https://pypi.python.org/packages/source/h/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
           "
 
-SRC_URI[md5sum] = "753b82f3bf632fbfc595816a0f6691f0"
-SRC_URI[sha256sum] = "bff5e3320fae20e3e7650bed216847ec32f3e85329014edb4d7ec2bc1b68cae2"
+SRC_URI[md5sum] = "9c130b16726cbf85159574ae5761bce7"
+SRC_URI[sha256sum] = "474a72722d66841f0e59cee285d837e1c6263be5be7bf2f8e824fc849a99adda"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 15/42] python-jsonpatch: upgrade 1.9 -> 1.11

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/{python-jsonpatch_1.9.bb => python-jsonpatch_1.11.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-jsonpatch_1.9.bb => python-jsonpatch_1.11.bb} (77%)

diff --git a/meta-openstack/recipes-devtools/python/python-jsonpatch_1.9.bb b/meta-openstack/recipes-devtools/python/python-jsonpatch_1.11.bb
similarity index 77%
rename from meta-openstack/recipes-devtools/python/python-jsonpatch_1.9.bb
rename to meta-openstack/recipes-devtools/python/python-jsonpatch_1.11.bb
index 24c87b0..3d9f058 100644
--- a/meta-openstack/recipes-devtools/python/python-jsonpatch_1.9.bb
+++ b/meta-openstack/recipes-devtools/python/python-jsonpatch_1.11.bb
@@ -9,8 +9,8 @@ SRCNAME = "jsonpatch"
 
 SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5eee76359052a1c289cf61eaf037332d"
-SRC_URI[sha256sum] = "e997076450992aa7af2f4ae6c3e7767d390ddb6746979c74fd2092bb8fbdf5b2"
+SRC_URI[md5sum] = "9f2d0aa31f99cc97089a203c5bed3924"
+SRC_URI[sha256sum] = "22d0bc0f5522a4a03dd9fb4c4cdf7c1f03256546c88be4c61e5ceabd22280e47"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 16/42] python-jsonpointer: upgrade 1.7 -> 1.9

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/{python-jsonpointer_1.7.bb => python-jsonpointer_1.9.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-jsonpointer_1.7.bb => python-jsonpointer_1.9.bb} (76%)

diff --git a/meta-openstack/recipes-devtools/python/python-jsonpointer_1.7.bb b/meta-openstack/recipes-devtools/python/python-jsonpointer_1.9.bb
similarity index 76%
rename from meta-openstack/recipes-devtools/python/python-jsonpointer_1.7.bb
rename to meta-openstack/recipes-devtools/python/python-jsonpointer_1.9.bb
index 14d38fd..61b2f3f 100644
--- a/meta-openstack/recipes-devtools/python/python-jsonpointer_1.7.bb
+++ b/meta-openstack/recipes-devtools/python/python-jsonpointer_1.9.bb
@@ -9,8 +9,8 @@ SRCNAME = "jsonpointer"
 
 SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "97666849a7c390950a5ecfbeb74e64f4"
-SRC_URI[sha256sum] = "46b2016b5e4f2b5cd2edf07c60ca8fe7dd91204ca848f98964be61b3c4760f5e"
+SRC_URI[md5sum] = "c4d3f28e72ba77062538d1c0864c40a9"
+SRC_URI[sha256sum] = "39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 17/42] python-msgpack: upgrade 0.4.5 -> 0.4.6

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/{python-msgpack_0.4.5.bb => python-msgpack_0.4.6.bb}       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-msgpack_0.4.5.bb => python-msgpack_0.4.6.bb} (74%)

diff --git a/meta-openstack/recipes-devtools/python/python-msgpack_0.4.5.bb b/meta-openstack/recipes-devtools/python/python-msgpack_0.4.6.bb
similarity index 74%
rename from meta-openstack/recipes-devtools/python/python-msgpack_0.4.5.bb
rename to meta-openstack/recipes-devtools/python/python-msgpack_0.4.6.bb
index 206b03d..96ec047 100644
--- a/meta-openstack/recipes-devtools/python/python-msgpack_0.4.5.bb
+++ b/meta-openstack/recipes-devtools/python/python-msgpack_0.4.6.bb
@@ -9,8 +9,8 @@ SRCNAME = "msgpack-python"
 
 SRC_URI = "https://pypi.python.org/packages/source/m/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "3b82bc542d5599896695512e7c32f42d"
-SRC_URI[sha256sum] = "a07cd6615a6bf38cfa2f010b121c7e77b74a3e7b971ef3e475c3d33308014cbb"
+SRC_URI[md5sum] = "8b317669314cf1bc881716cccdaccb30"
+SRC_URI[sha256sum] = "bfcc581c9dbbf07cc2f951baf30c3249a57e20dcbd60f7e6ffc43ab3cc614794"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 18/42] python-pecan: upgrade 0.8.3 -> 0.9.0

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/{python-pecan_0.8.3.bb => python-pecan_0.9.0.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-pecan_0.8.3.bb => python-pecan_0.9.0.bb} (80%)

diff --git a/meta-openstack/recipes-devtools/python/python-pecan_0.8.3.bb b/meta-openstack/recipes-devtools/python/python-pecan_0.9.0.bb
similarity index 80%
rename from meta-openstack/recipes-devtools/python/python-pecan_0.8.3.bb
rename to meta-openstack/recipes-devtools/python/python-pecan_0.9.0.bb
index e7f32cd..efab57e 100644
--- a/meta-openstack/recipes-devtools/python/python-pecan_0.8.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-pecan_0.9.0.bb
@@ -10,8 +10,8 @@ SRCNAME = "pecan"
 SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
 "
 
-SRC_URI[md5sum] = "e2b329c5088c2adb1510ac9d1af84bca"
-SRC_URI[sha256sum] = "ca6c31e1fb98e4ae780a44a40a88eacb7a19172d3f64d4e31f32049a784a1281"
+SRC_URI[md5sum] = "f739a18866a83f6b9ac8622ee89ea784"
+SRC_URI[sha256sum] = "d26be0e451c5999504599a9a741534caa0fba97d9bb8991c951f63b79a30b933"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 19/42] json: upgrade 1.8.1 -> 1.8.3

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Dropped 0001-Dont-compile-extensions.patch, it is not needed anymore.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../ruby/json/0001-Dont-compile-extensions.patch     | 20 --------------------
 meta-openstack/recipes-devtools/ruby/json_git.bb     |  5 ++---
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch

diff --git a/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch b/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
deleted file mode 100644
index 0c2f513..0000000
--- a/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 8c6e4b688cc7feade17caa832f9304262025fd17 Mon Sep 17 00:00:00 2001
-From: Qian Lei <qianl.fnst@cn.fujitsu.com>
-Date: Tue, 27 Jan 2015 19:34:26 +0800
-Subject: [PATCH] Dont compile extensions
-
-Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
----
- json.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/json.gemspec b/json.gemspec
-index 75926b1..af7e9ca 100644
---- a/json.gemspec
-+++ b/json.gemspec
-@@ -13 +13 @@ Gem::Specification.new do |s|
--  s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"]
-+#  s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"]
--- 
-1.8.3.1
-
diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb
index f738ece..a417798 100644
--- a/meta-openstack/recipes-devtools/ruby/json_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/json_git.bb
@@ -9,15 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aef161fe3c86f1a8d6c71d3b8c5655c5"
 
 PR = "r0"
 
-BPV = "1.8.1"
+BPV = "1.8.3"
 PV = "${BPV}"
-SRCREV = "92a96dea2b24b9c68856004d69491f46aedd0925"
+SRCREV = "db4c71a7701b95c30f945ee1536240920dcfdc17"
 
 S = "${WORKDIR}/git"
 
 SRC_URI = " \
     git://github.com/flori/json.git \
-    file://0001-Dont-compile-extensions.patch \
     "
 
 inherit ruby
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 20/42] libvirt: remove sanlock from PACKAGECONFIG

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

There exists no recipe for sanlock and the libvirt recipe doesn't have
a sanlock PACKAGECONFIG so removing sanlock from the set of
PACKAGECONFIGs.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend
index 195633b..874bfd6 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend
+++ b/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend
@@ -1,5 +1,5 @@
 PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \
-	 	 python sanlock ebtables \
+	 	 python ebtables \
 		 ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
 		"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 21/42] ruby.bbclass: Error fix

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

When build the recipes which inherit ruby,ERROR will occur as following:
ERROR: QA Issue: non debug package contains .debug directory: json
path /work/core2-64-oe-linux/json/1.8.3-r0/packages-split/json/usr/lib/ruby/
gems/2.2.0/extensions/x86_64-linux/2.2.0/json-1.8.3/json/ext/.debug/generator.so [debug-files]
So modify ruby.bbclass.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/classes/ruby.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/classes/ruby.bbclass b/meta-openstack/classes/ruby.bbclass
index 957abf7..0c842d5 100644
--- a/meta-openstack/classes/ruby.bbclass
+++ b/meta-openstack/classes/ruby.bbclass
@@ -114,6 +114,7 @@ FILES_${PN}-dbg += " \
         ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/.debug \
         ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/.debug \
         ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/*/.debug \
+        ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions/*/*/*/*/*/.debug \
         "
 
 FILES_${PN} += " \
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 22/42] glance: add new dependencies

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

Attempting to run glance-api several python traces are
encountered. The following packages were identified in the traces and
as such are added as dependencies which allows glance-api to launch
successfully.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Removing python-oslo.vmware_1.19.0 since the latest version of
Kilo is 0.11.2, and was already present in the repo.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>

Conflicts:
	meta-openstack/recipes-devtools/python/python-glance_git.bb
---
 .../recipes-devtools/python/python-glance_git.bb   |  3 +++
 .../python/python-semantic-version_2.4.2.bb        | 27 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb

diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index 389385c..a4e07d1 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -199,6 +199,9 @@ RDEPENDS_${PN} += "python-greenlet \
 	python-retrying \
         python-glancestore \
         python-oslo.vmware \
+	python-glancestore \
+	python-enum34 \
+	python-semantic-version \
 	"
 
 RDEPENDS_${SRCNAME} = "${PN} \
diff --git a/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb b/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb
new file mode 100644
index 0000000..746d646
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "A library which provides a few tools to handle SemVer in Python."
+HOMEPAGE = "http://pypi.python.org/pypi/semantic_version"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a7dcaa0740d59f8f13ef05a3d0ed7313"
+
+SRCNAME = "semantic_version"
+SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "fd7d5ade76e78d8540b9a4044496a57c"
+SRC_URI[sha256sum] = "7e8b7fa74a3bc9b6e90b15b83b9bc2377c78eaeae3447516425f475d5d6932d2"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+#export BUILD_SYS
+#export HOST_SYS
+
+inherit setuptools
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 23/42] keystone: the 'sql' section is deprecated

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

Attempting to use commands such as 'glance image-list' or 'keystone
tenant-list' was resulting in various errors including 'error
500'. Examining the logs it was found that keystone was throwing the
following warning:

  WARNING oslo_config.cfg [-] Option "connection" from group "sql" is
  deprecated. Use option "connection" from group "database".

Examining the database I found that the keystone database existed but
was empty. This indicates that some of the install scripts were
failing, possibly due to issues connecting to the database due to a
bad configuration. So taking the WARNING to heed I swapped the 'sql'
section header for 'database' and now the database is properly created
and keystone commands can be successfully executed.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-keystone/keystone.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf b/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
index 0ab1c3f..cdeb156 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
+++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
@@ -73,7 +73,7 @@ admin_token=%SERVICE_TOKEN%
 # or a module with notify() method:
 # onready = keystone.common.systemd
 
-[sql]
+[database]
 # The SQLAlchemy connection string used to connect to the database
 connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/keystone
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 24/42] python-vcversioner: add new recipe

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

Add python-vcversioner,since the newer python-jsonschema depends on it.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-vcversioner_2.14.0.0.bb                | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb

diff --git a/meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb b/meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb
new file mode 100644
index 0000000..2fe96ab
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-vcversioner_2.14.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "An implementation of JSON Schema validation for Python"
+HOMEPAGE = "http://github.com/Julian/jsonschema"
+SECTION = "devel/python"
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://vcversioner.py;beginline=1;endline=13;md5=b20bc154910c13368ad5ba54560f0b0c"
+
+SRCNAME = "vcversioner"
+
+SRC_URI = "http://pypi.python.org/packages/source/v/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "7848a365ced9941053bc25d9a9f8f4b4"
+SRC_URI[sha256sum] = "acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357c03b86"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 25/42] python-jsonschema: upgrade 2.4.0 -> 2.5.1

[Josep Puigdemont]

From: Li xin <lixin.fnst@cn.fujitsu.com>

The newer python-jsonschema depends on python-vcversioner.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../{python-jsonschema_2.4.0.bb => python-jsonschema_2.5.1.bb}      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-jsonschema_2.4.0.bb => python-jsonschema_2.5.1.bb} (70%)

diff --git a/meta-openstack/recipes-devtools/python/python-jsonschema_2.4.0.bb b/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb
similarity index 70%
rename from meta-openstack/recipes-devtools/python/python-jsonschema_2.4.0.bb
rename to meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb
index e27a242..a3a7ec0 100644
--- a/meta-openstack/recipes-devtools/python/python-jsonschema_2.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb
@@ -9,9 +9,11 @@ SRCNAME = "jsonschema"
 
 SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.zip"
 
-SRC_URI[md5sum] = "f645c88123189976058fcf550c02e50f"
-SRC_URI[sha256sum] = "acf1e360b4682d64ba6acc35dbc65d81d9bde68a291a97f14f16f4282733f5a4"
+SRC_URI[md5sum] = "e491298485bdefeecb0f1ca3d65e5292"
+SRC_URI[sha256sum] = "9088494da4c74497a7a27842ae4ca9c3355b5f7754121edc440463eaf020f079"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+DEPENDS += "python-vcversioner"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 26/42] python-testtools: upgrade 0.9.33 -> 1.8.0

[Josep Puigdemont]

From: Lei Maohui <leimaohui@cn.fujitsu.com>

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/{python-testtools_0.9.33.bb => python-testtools_1.8.0.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-testtools_0.9.33.bb => python-testtools_1.8.0.bb} (76%)

diff --git a/meta-openstack/recipes-devtools/python/python-testtools_0.9.33.bb b/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb
similarity index 76%
rename from meta-openstack/recipes-devtools/python/python-testtools_0.9.33.bb
rename to meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb
index 48663e9..80a7489 100644
--- a/meta-openstack/recipes-devtools/python/python-testtools_0.9.33.bb
+++ b/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb
@@ -9,8 +9,8 @@ SRCNAME = "testtools"
 
 SRC_URI = "https://pypi.python.org/packages/source/t/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "310ce6fab8affecdc7415ff910a83c42"
-SRC_URI[sha256sum] = "5b62231fea71ccb2361d48286481b198ccb8768bf81f8aaec1c8d5fb98eaaca3"
+SRC_URI[md5sum] = "89965b0b39930c0d1f5e07c6f545e6a0"
+SRC_URI[sha256sum] = "8afd6400fb4e75adb0b29bd09695ecb2024cd7befab4677a58c147701afadd97"
 
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 27/42] python-testtools: fix build error

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

Ran in to a build error:
distutils.errors.DistutilsError: Could not find suitable distribution for Requirement.parse('pbr')
ERROR: python setup.py build execution failed.

Fix by DEPENDing on python-pbr.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb b/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb
index 80a7489..a58c91a 100644
--- a/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb
@@ -17,4 +17,8 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
+DEPENDS += " \
+    python-pbr \
+"
+
 RDEPENDS_${PN} += "python-extras"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 28/42] keystone: add missing functools32 module

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

Keystone fails to install due to functools32 missing. Add a new recipe
for functools32 and include the dependency in keystone.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-functools32_3.2.3-2.bb           | 29 ++++++++++++++++++++++
 .../recipes-devtools/python/python-keystone_git.bb |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-functools32_3.2.3-2.bb

diff --git a/meta-openstack/recipes-devtools/python/python-functools32_3.2.3-2.bb b/meta-openstack/recipes-devtools/python/python-functools32_3.2.3-2.bb
new file mode 100644
index 0000000..937e933
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-functools32_3.2.3-2.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Python higher-order functions and operations on callable objects"
+HOMEPAGE = "https://pypi.python.org/pypi/functools32"
+SECTION = "devel/python"
+LICENSE = "PSFv2"
+
+SRCNAME = "functools32"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=27cf2345969ed18e6730e90fb0063a10"
+SRC_URI = "http://pypi.python.org/packages/source/f/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "09f24ffd9af9f6cd0f63cb9f4e23d4b2"
+SRC_URI[sha256sum] = "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+DISTUTILS_INSTALL_ARGS = "--root=${D} \
+    --prefix=${prefix} \
+    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
+    --install-data=${datadir}"
+
+DEPENDS += " \
+	python-pbr \
+	"
+
+RDEPENDS_${PN} += "python-testtools \
+	python-pbr \
+	"
+
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index ed0d7b8..21318d6 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -287,6 +287,7 @@ RDEPENDS_${PN} += " \
         python-fixtures \
         python-oslotest \
         python-cryptography \
+        python-functools32 \
         "
 
 RDEPENDS_${SRCNAME}-tests += " bash"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 29/42] django-pyscss: uprev to version 2.0.2

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

This uprev is needed to work around an error when attempting to log in
to the horizon dashboard:

Couldn't find anything to import: bootstrap/variables

The upstream fix bd8b2ae8bf21b9c4f671d9364cdc41fbced9b214 [Retain the
imported file path] forms the basis of the 2.0.2 release and fixes
this error, per bug:
https://github.com/fusionbox/django-pyscss/issues/34.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../{python-django-pyscss_1.0.6.bb => python-django-pyscss_2.0.2.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-django-pyscss_1.0.6.bb => python-django-pyscss_2.0.2.bb} (80%)

diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
similarity index 80%
rename from meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb
rename to meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
index f05018a..7c5606a 100644
--- a/meta-openstack/recipes-devtools/python/python-django-pyscss_1.0.6.bb
+++ b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
@@ -4,13 +4,12 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=07339dad721a3ae7e420b8b751a15c70"
 
-PR = "r0"
 
 SRCNAME = "django-pyscss"
 SRC_URI = "http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "dd96a50f663d4e079f4e6ac043ca5022"
-SRC_URI[sha256sum] = "4575e65fa1a28529211ba22d7009e62d4f25a4ab2e7d7de14abea2e5b1c9f8f6"
+SRC_URI[md5sum] = "f8dbcc4d314c8e220aa311ec6561b06d"
+SRC_URI[sha256sum] = "0f4844f8fd3f69f4d428a616fdcf2b650a24862dd81443ae3fba14980c7b0615"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 30/42] openvswitch: add as RRECOMMENDS for compute and controller

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

We use openvswitch throughout the openstack images so we need to make
sure the kernel module is available by adding it to the list of
RRECOMMENDS packages.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../recipes-extended/packagegroups/packagegroup-cloud-compute.bb         | 1 +
 .../recipes-extended/packagegroups/packagegroup-cloud-controller.bb      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
index 2769e02..98a7348 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
@@ -41,4 +41,5 @@ RRECOMMENDS_${PN} = " \
     kernel-module-fuse \
     kernel-module-softdog \
     kernel-module-veth \
+    kernel-module-openvswitch \
     "
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
index 706d3ec..2718d2e 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
@@ -61,4 +61,5 @@ RRECOMMENDS_${PN} = " \
     kernel-module-fuse \
     cloud-init \
     kernel-module-softdog \
+    kernel-module-openvswitch \
     "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 31/42] python-sqlalchemy-migrate: depends on sqlparse

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb
index 32ecdb3..eddd4ea 100644
--- a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb
+++ b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.9.7.bb
@@ -24,4 +24,5 @@ RDEPENDS_${PN} += "python-sqlalchemy  \
 	python-decorator \
 	python-tempita  \
         python-pbr \
+        python-sqlparse \
     "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 32/42] python-cliff: Fix object has no attribute debug error

[Josep Puigdemont]

Apply fix provided by upstream for the "object has no attribute error"
when help is called.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 ...1-Fix-object-has-no-attribute-debug-error.patch | 32 ++++++++++++++++++++++
 .../recipes-devtools/python/python-cliff_1.10.0.bb |  5 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-cliff/0001-Fix-object-has-no-attribute-debug-error.patch

diff --git a/meta-openstack/recipes-devtools/python/python-cliff/0001-Fix-object-has-no-attribute-debug-error.patch b/meta-openstack/recipes-devtools/python/python-cliff/0001-Fix-object-has-no-attribute-debug-error.patch
new file mode 100644
index 0000000..38d5343
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cliff/0001-Fix-object-has-no-attribute-debug-error.patch
@@ -0,0 +1,32 @@
+From f2c997161df01579cabf312a694289a1a83ae6ca Mon Sep 17 00:00:00 2001
+From: TerryHowe <terrylhowe@gmail.com>
+Date: Thu, 28 May 2015 07:55:11 -0600
+Subject: [PATCH] Fix object has no attribute debug error
+
+When print_help_if_requested is called, if there is an error,
+"object has no attribute 'debug'" gets printed out.  This is
+because the parser is passed in to the command rather than the
+parsed arguments.
+
+Change-Id: I1863421eff82b3f493d276432369ada9f783b165
+Partial-Bug: #1459519
+---
+ cliff/app.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cliff/app.py b/cliff/app.py
+index e052571..a41386a 100644
+--- a/cliff/app.py
++++ b/cliff/app.py
+@@ -198,7 +198,7 @@ class App(object):
+     def print_help_if_requested(self):
+         if self.deferred_help and self.options.deferred_help:
+             action = HelpAction(None, None, default=self)
+-            action(self.parser, self.parser, None, None)
++            action(self.parser, self.options, None, None)
+ 
+     def run(self, argv):
+         """Equivalent to the main program for the application.
+-- 
+2.1.0
+
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 e107a28..e7e1f7e 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
@@ -4,10 +4,11 @@ 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 = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+    file://0001-Fix-object-has-no-attribute-debug-error.patch \
+    "
 
 SRC_URI[md5sum] = "8f3f67d57bf5a2541efeedcea1aa64ab"
 SRC_URI[sha256sum] = "209882e199fdf98aeed0db44b922aa688e5a66d81c45148a5743804f9aa680e1"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 33/42] python-nova: dependency on blkid

[Josep Puigdemont]

nova executes blkid before creating an instance in order to
determine the file system type of the image given.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-nova_git.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 4af1ded..fa1bdfd 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -345,7 +345,9 @@ RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \
 				  postgresql postgresql-client python-psycopg2"
 
 RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \
-			       qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh"
+			       qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh \
+			       util-linux-blkid \
+			       "
 RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common"
 RDEPENDS_${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common"
 
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 34/42] yocto-kernel: enable NAT

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
index 9160ffe..223210c 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
@@ -5,3 +5,4 @@ CONFIG_NF_NAT_PROTO_SCTP=m
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_NAT=m
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 35/42] python-pbr: upgrade to 0.11

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/{python-pbr_0.10.8.bb => python-pbr_0.11.0.bb}         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-pbr_0.10.8.bb => python-pbr_0.11.0.bb} (73%)

diff --git a/meta-openstack/recipes-devtools/python/python-pbr_0.10.8.bb b/meta-openstack/recipes-devtools/python/python-pbr_0.11.0.bb
similarity index 73%
rename from meta-openstack/recipes-devtools/python/python-pbr_0.10.8.bb
rename to meta-openstack/recipes-devtools/python/python-pbr_0.11.0.bb
index ec5c589..b81ed6f 100644
--- a/meta-openstack/recipes-devtools/python/python-pbr_0.10.8.bb
+++ b/meta-openstack/recipes-devtools/python/python-pbr_0.11.0.bb
@@ -4,24 +4,20 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r0"
 SRCNAME = "pbr"
 
 SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "ccef0c0fa2ad7ee2c9997322a83d7e45"
-SRC_URI[sha256sum] = "a741650c697abe9dd3da00039a57a45a15a6eed017a16f6b7e4c0161fae2b4b2"
+SRC_URI[md5sum] = "e69466b4206e350f4f1e1db2e11ab73b"
+SRC_URI[sha256sum] = "d7f0d69aef367a764d69a4728afd966025ce9394d6029a924ef838ecdf592f6d"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-# DEPENDS_default: python-pip
-
 DEPENDS += " \
         python-pip \
         "
 
-# RDEPENDS_default:
 RDEPENDS_${PN} += " \
         "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 36/42] python-novaclient: upgrade to 2.23.2

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-novaclient_git.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index 1454a7c..1e60fb4 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -4,15 +4,13 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"
 
-PR = "r0"
-
 SRC_URI = "\
-	git://github.com/openstack/python-novaclient.git;branch=master \
+	git://github.com/openstack/python-novaclient.git;branch=stable/kilo \
 	file://nova-api-check.sh \
 	"
 
-PV = "2.23.0+git${SRCPV}"
-SRCREV = "e0f5072907a00d48a183dd8fc91a6cf6038ca279"
+PV = "2.23.2+git${SRCPV}"
+SRCREV = "4ab9db648653f7ea6b9f8b1c78bff672b20b913f"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 37/42] python-ceilometer: upgrade to 2015.1.2

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index c3a69ee..0a19370 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r0"
 SRCNAME = "ceilometer"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
            file://ceilometer.conf \
            file://ceilometer.init \
            file://fix_ceilometer_memory_leak.patch \
@@ -16,8 +15,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
 #   file://ceilometer-builtin-tests-config-location.patch
 
 
-SRCREV="b2871217fec965c77581b0f4a33608dad7867d4b"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV="06b9b908406e078bdbff2aa7e18d19f55ef31037"
+PV="2015.1.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 CEILOMETER_SECRET ?= "12121212"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 38/42] python-oslo.versionedobjects: added recipe

[Josep Puigdemont]

Heat depends on oslo.versionedobjects.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/python-oslo.versionedobjects_0.1.1.bb   | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_0.1.1.bb

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_0.1.1.bb b/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_0.1.1.bb
new file mode 100644
index 0000000..77127e6
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_0.1.1.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "A library that provides a generic versioned object model that is RPC-friendly, with inbuilt serialization, field typing, and remotable method calls"
+HOMEPAGE = "http://docs.openstack.org/developer/oslo.versionedobjects/"
+SECTION = "devel/python"
+LICENSE = "Apache-2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+SRC_URI[md5sum] = "11309423d1a08aab4a81a20e2dcca8d5"
+SRC_URI[sha256sum] = "dac8ef3ec789bd3f69f3f974e9f40282a411d804663eefd1ae39721f16a4c2da"
+
+inherit pypi
+
+RDEPENDS_${PN} += " \
+    python-babel \
+    python-fixtures \
+    python-iso8601 \
+    python-mock \
+    python-oslo.concurrency \
+    python-oslo.context \
+    python-oslo.i18n \
+    python-oslo.log \
+    python-oslo.messaging \
+    python-oslo.serialization \
+    python-oslo.utils \
+    python-webob \
+    python-six \
+    "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 39/42] python-heat: update to 2015.1.2

[Josep Puigdemont]

Added dependency on python-versionedobjects after the upgrade.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-heat_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 5926cc0..acba315 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r0"
 SRCNAME = "heat"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
            file://heat.conf \
            file://heat.init \
            file://autoscaling_example.template \
@@ -16,8 +15,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://heat-tests-change-project_dir-path.patch \
 "
 
-SRCREV="6d106dee26649202791596062b5a29049e962d80"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV="a4aafba0c2b387df888dfd805594b78b39b5f495"
+PV="2015.1.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn"
@@ -212,6 +211,7 @@ RDEPENDS_${PN} += " \
         python-pytz \
         python-pbr \
         python-oslo.log \
+        python-oslo.versionedobjects \
 	"
 
 RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 40/42] packagegroup-cloud-compute: add tun kernel module

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-extended/packagegroups/packagegroup-cloud-compute.bb         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
index 98a7348..29721e8 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
@@ -42,4 +42,5 @@ RRECOMMENDS_${PN} = " \
     kernel-module-softdog \
     kernel-module-veth \
     kernel-module-openvswitch \
+    kernel-module-tun \
     "
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 41/42] packagegroup-cloud-extras: include xterm only if x11 in DISTRO_FEATURES

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-extended/packagegroups/packagegroup-cloud-extras.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
index 35b9b6e..721e2c9 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
@@ -8,7 +8,7 @@ inherit packagegroup
 
 RDEPENDS_${PN} = " \
     vim \
-    xterm \
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'xterm', '', d)} \
     "
 
 IMAGE_FEATURES += "package-management"
-- 
2.5.0

[meta-cloud-services][fido-kilo][PATCH 42/42] Remove argparse from requirements.txt of some modules

[Josep Puigdemont]

argparse is required by some of the CLI applications of openstack. The
module is provided by python 2.7, however python-distribute (used in fido),
is not able to find it:

Python 2.7.9 (default, Oct 27 2015, 18:12:55)
[GCC 4.9.2] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import pkg_resources
>>> pkg_resources.get_distribution('argparse')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 338, in get_distribution
    if isinstance(dist,Requirement): dist = get_provider(dist)
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 217, in get_provider
    return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 698, in require
    needed = self.resolve(parse_requirements(requirements))
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 596, in resolve
    raise DistributionNotFound(req)
pkg_resources.DistributionNotFound: argparse
>>> import argparse
>>>

This patch removes argparse from requirements.txt on the python modules
used by python-openstackclient, so openstack won't bail out on some
circumstances like when doing "openstack -h".

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
 .../python/python-cinderclient_git.bb              |  3 ++-
 .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
 .../recipes-devtools/python/python-cliff_1.10.0.bb |  1 +
 .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
 .../python/python-glanceclient_git.bb              |  1 +
 .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
 .../python/python-keystoneclient_git.bb            |  1 +
 .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
 .../python/python-neutronclient_git.bb             |  3 +--
 .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
 .../python/python-novaclient_git.bb                |  1 +
 .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
 .../python/python-oslo.config_1.9.3.bb             |  4 ++--
 .../Remove-argparse-from-requirements.txt.patch    | 23 ++++++++++++++++++++
 .../python/python-stevedore_1.3.0.bb               |  2 ++
 16 files changed, 209 insertions(+), 5 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch

diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..0e597a4
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,25 @@
+From 7b3f09895c81cf9db0f40dd01e5e1ed5dc5af154 Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 17:30:28 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 5a66b60..869d6c4 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -2,7 +2,6 @@
+ # of appearance. Changing the order has an impact on the overall integration
+ # process, which may cause wedges in the gate later.
+ pbr!=0.7,<1.0,>=0.6
+-argparse
+ PrettyTable<0.8,>=0.7
+ python-keystoneclient<1.4.0,>=1.2.0
+ requests!=2.4.0,>=2.2.0
+-- 
+2.1.0
+
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index 951198d..4d8f00f 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -11,10 +11,11 @@ SRC_URI = "\
 	git://github.com/openstack/python-cinderclient.git;branch=stable/kilo \
 	file://fix_cinderclient_memory_leak.patch \
 	file://cinder-api-check.sh \
+	file://Remove-argparse-from-requirements.txt.patch \
 	"
 
 PV="1.1.2+git${SRCPV}"
-SRCREV="b44d32d02b014748044b5b18d27a9d1f8312145c"
+SRCREV="36ad09c4fd6af691f0a7c3c47c9876187bcf71c8"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor
diff --git a/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..ccf46c8
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,25 @@
+From 4246bd70dab5b4da8b3f905ca714ee2ea522c06e Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 20:55:48 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 754a591..8342cc0 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -2,7 +2,6 @@
+ # of appearance. Changing the order has an impact on the overall integration
+ # process, which may cause wedges in the gate later.
+ pbr>=0.6,!=0.7,<1.0
+-argparse
+ cmd2>=0.6.7
+ PrettyTable>=0.7,<0.8
+ pyparsing>=2.0.1
+-- 
+2.1.0
+
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 e7e1f7e..3843214 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
@@ -8,6 +8,7 @@ SRCNAME = "cliff"
 
 SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
     file://0001-Fix-object-has-no-attribute-debug-error.patch \
+    file://Remove-argparse-from-requirements.txt.patch \
     "
 
 SRC_URI[md5sum] = "8f3f67d57bf5a2541efeedcea1aa64ab"
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..387eea5
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,25 @@
+From aed6b40f160f6094c5625482e6ce4ddfd96270c0 Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 19:22:02 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 406fa8d..4021fe3 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -3,7 +3,6 @@
+ # process, which may cause wedges in the gate later.
+ pbr!=0.7,<1.0,>=0.6
+ Babel>=1.3
+-argparse
+ PrettyTable<0.8,>=0.7
+ python-keystoneclient<1.4.0,>=1.2.0
+ pyOpenSSL>=0.11
+-- 
+2.1.0
+
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index 430e32d..aa231a3 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -11,6 +11,7 @@ SRC_URI = "\
 	git://github.com/openstack/${BPN}.git;protocol=https;branch=stable/kilo \
 	file://fix_glanceclient_memory_leak.patch \
 	file://glance-api-check.sh \
+	file://Remove-argparse-from-requirements.txt.patch \
 	"
 
 S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..6549f05
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,25 @@
+From 67d41300eaba99aaad4a058ddf7afd10a8a56368 Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 17:32:48 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 8e6ac51..1515da1 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -4,7 +4,6 @@
+ 
+ pbr!=0.7,<1.0,>=0.6
+ 
+-argparse
+ Babel>=1.3
+ iso8601>=0.1.9
+ netaddr>=0.7.12
+-- 
+2.1.0
+
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index 5c5d98c..de162b7 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -10,6 +10,7 @@ SRC_URI = "\
 	git://github.com/openstack/python-keystoneclient.git;branch=stable/kilo \
 	file://fix_keystoneclient_memory_leak.patch \
 	file://keystone-api-check.sh \
+	file://Remove-argparse-from-requirements.txt.patch \
 	"
 
 PV = "1.3.3+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..10bbef3
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,25 @@
+From 89ae693563a61acfbed5273a5c9b43b6d98346d5 Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 17:21:27 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 12f89a0..3966547 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -2,7 +2,6 @@
+ # of appearance. Changing the order has an impact on the overall integration
+ # process, which may cause wedges in the gate later.
+ pbr>=0.6,!=0.7,<1.0
+-argparse
+ cliff>=1.10.0,<1.11.0  # Apache-2.0
+ iso8601>=0.1.9
+ netaddr>=0.7.12
+-- 
+2.1.0
+
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index e35be5d..4f9ea33 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -18,11 +18,10 @@ RDEPENDS_${PN} +="python-cliff \
 	python-pbr \
 	"
 
-PR = "r0"
-
 SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \
            file://neutronclient-use-csv-flag-instead-of-json.patch \
            file://neutron-api-check.sh \
+           file://Remove-argparse-from-requirements.txt.patch \
           "
 
 PV = "2.4.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..8ae80dd
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,25 @@
+From 0a3e2f3197babcc2488c02b829e744290fac4309 Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 17:25:51 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 9f20356..6f65859 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -2,7 +2,6 @@
+ # of appearance. Changing the order has an impact on the overall integration
+ # process, which may cause wedges in the gate later.
+ pbr!=0.7,<1.0,>=0.6
+-argparse
+ iso8601>=0.1.9
+ oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
+ oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+-- 
+2.1.0
+
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index 1e60fb4..0045c75 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"
 SRC_URI = "\
 	git://github.com/openstack/python-novaclient.git;branch=stable/kilo \
 	file://nova-api-check.sh \
+	file://Remove-argparse-from-requirements.txt.patch \
 	"
 
 PV = "2.23.2+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..b12b048
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,25 @@
+From 501e153e3d2c4e618a928889626aa49ba636c22f Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 20:51:40 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 56a2508..da0454e 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -3,7 +3,6 @@
+ # process, which may cause wedges in the gate later.
+ 
+ pbr>=0.6,!=0.7,<1.0
+-argparse
+ netaddr>=0.7.12
+ six>=1.9.0
+ stevedore>=1.1.0  # Apache-2.0
+-- 
+2.1.0
+
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
index 3094b1e..52343cc 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "API supporting parsing command line arguments and .ini style configuration files."
-HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/1.1.0"
+HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
 
-PR = "r0"
 SRCNAME = "oslo.config"
 
 SRC_URI = "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
 
 SRC_URI[md5sum] = "109da1307ea8c65440accccbc59cf9a5"
 SRC_URI[sha256sum] = "ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140"
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
new file mode 100644
index 0000000..85b8f14
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
@@ -0,0 +1,23 @@
+From b1d624241b6d7d2dcd63f5ebe93f79fccd5ad663 Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 24 Nov 2015 20:48:13 +0100
+Subject: [PATCH] Remove argparse from requirements.txt
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index f7f4cc9..3a2c63a 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -3,5 +3,4 @@
+ # process, which may cause wedges in the gate later.
+ 
+ pbr>=0.6,!=0.7,<1.0
+-argparse
+ six>=1.9.0
+-- 
+2.1.0
+
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
index 6100f68..d4bf4c0 100644
--- a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI[md5sum] = "e9ed2a1cf91ee76fd9045f902fa58089"
 SRC_URI[sha256sum] = "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"
 
+SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
+
 inherit pypi
 
 DEPENDS += " \
-- 
2.5.0

Re: [meta-cloud-services][fido-kilo][PATCH 42/42] Remove argparse from requirements.txt of some modules

[Mark Asselstine]

On Tue, Dec 8, 2015 at 12:33 PM, Josep Puigdemont
<josep.puigdemont@enea.com> wrote:
> argparse is required by some of the CLI applications of openstack. The
> module is provided by python 2.7, however python-distribute (used in fido),
> is not able to find it:
>
> Python 2.7.9 (default, Oct 27 2015, 18:12:55)
> [GCC 4.9.2] on linux2
> Type "help", "copyright", "credits" or "license" for more information.
>>>> import pkg_resources
>>>> pkg_resources.get_distribution('argparse')
> Traceback (most recent call last):
>   File "<stdin>", line 1, in <module>
>   File
> "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> line 338, in get_distribution
>     if isinstance(dist,Requirement): dist = get_provider(dist)
>   File
> "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> line 217, in get_provider
>     return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
>   File
> "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> line 698, in require
>     needed = self.resolve(parse_requirements(requirements))
>   File
> "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> line 596, in resolve
>     raise DistributionNotFound(req)
> pkg_resources.DistributionNotFound: argparse
>>>> import argparse
>>>>
>
> This patch removes argparse from requirements.txt on the python modules
> used by python-openstackclient, so openstack won't bail out on some
> circumstances like when doing "openstack -h".


I have a different solution for this issue in the stuff I am staging
for master. The same end result but instead of managing patches I
simply add

+do_install_append() {
+    # argparse is stdlib since 2.6 so we can drop this to avoid
consistency check errors
+    sed -i '/argparse/d'
${D}${libdir}/python2.7/site-packages/${SRCNAME}-${PV}-py2.7.egg-info/requires.txt
+}

Or a variation of the above to the recipes which have argparse in the
requires.txt.

Your solution is fine but we should probably stick to one. Bruce can
make the call.

Mark


>
> Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> ---
>  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
>  .../python/python-cinderclient_git.bb              |  3 ++-
>  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
>  .../recipes-devtools/python/python-cliff_1.10.0.bb |  1 +
>  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
>  .../python/python-glanceclient_git.bb              |  1 +
>  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
>  .../python/python-keystoneclient_git.bb            |  1 +
>  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
>  .../python/python-neutronclient_git.bb             |  3 +--
>  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
>  .../python/python-novaclient_git.bb                |  1 +
>  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
>  .../python/python-oslo.config_1.9.3.bb             |  4 ++--
>  .../Remove-argparse-from-requirements.txt.patch    | 23 ++++++++++++++++++++
>  .../python/python-stevedore_1.3.0.bb               |  2 ++
>  16 files changed, 209 insertions(+), 5 deletions(-)
>  create mode 100644 meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
>
> diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..0e597a4
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,25 @@
> +From 7b3f09895c81cf9db0f40dd01e5e1ed5dc5af154 Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 17:30:28 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index 5a66b60..869d6c4 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -2,7 +2,6 @@
> + # of appearance. Changing the order has an impact on the overall integration
> + # process, which may cause wedges in the gate later.
> + pbr!=0.7,<1.0,>=0.6
> +-argparse
> + PrettyTable<0.8,>=0.7
> + python-keystoneclient<1.4.0,>=1.2.0
> + requests!=2.4.0,>=2.2.0
> +--
> +2.1.0
> +
> diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> index 951198d..4d8f00f 100644
> --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> @@ -11,10 +11,11 @@ SRC_URI = "\
>         git://github.com/openstack/python-cinderclient.git;branch=stable/kilo \
>         file://fix_cinderclient_memory_leak.patch \
>         file://cinder-api-check.sh \
> +       file://Remove-argparse-from-requirements.txt.patch \
>         "
>
>  PV="1.1.2+git${SRCPV}"
> -SRCREV="b44d32d02b014748044b5b18d27a9d1f8312145c"
> +SRCREV="36ad09c4fd6af691f0a7c3c47c9876187bcf71c8"
>  S = "${WORKDIR}/git"
>
>  inherit setuptools monitor
> diff --git a/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..ccf46c8
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,25 @@
> +From 4246bd70dab5b4da8b3f905ca714ee2ea522c06e Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 20:55:48 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index 754a591..8342cc0 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -2,7 +2,6 @@
> + # of appearance. Changing the order has an impact on the overall integration
> + # process, which may cause wedges in the gate later.
> + pbr>=0.6,!=0.7,<1.0
> +-argparse
> + cmd2>=0.6.7
> + PrettyTable>=0.7,<0.8
> + pyparsing>=2.0.1
> +--
> +2.1.0
> +
> 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 e7e1f7e..3843214 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
> @@ -8,6 +8,7 @@ SRCNAME = "cliff"
>
>  SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
>      file://0001-Fix-object-has-no-attribute-debug-error.patch \
> +    file://Remove-argparse-from-requirements.txt.patch \
>      "
>
>  SRC_URI[md5sum] = "8f3f67d57bf5a2541efeedcea1aa64ab"
> diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..387eea5
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,25 @@
> +From aed6b40f160f6094c5625482e6ce4ddfd96270c0 Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 19:22:02 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index 406fa8d..4021fe3 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -3,7 +3,6 @@
> + # process, which may cause wedges in the gate later.
> + pbr!=0.7,<1.0,>=0.6
> + Babel>=1.3
> +-argparse
> + PrettyTable<0.8,>=0.7
> + python-keystoneclient<1.4.0,>=1.2.0
> + pyOpenSSL>=0.11
> +--
> +2.1.0
> +
> diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> index 430e32d..aa231a3 100644
> --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> @@ -11,6 +11,7 @@ SRC_URI = "\
>         git://github.com/openstack/${BPN}.git;protocol=https;branch=stable/kilo \
>         file://fix_glanceclient_memory_leak.patch \
>         file://glance-api-check.sh \
> +       file://Remove-argparse-from-requirements.txt.patch \
>         "
>
>  S = "${WORKDIR}/git"
> diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..6549f05
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,25 @@
> +From 67d41300eaba99aaad4a058ddf7afd10a8a56368 Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 17:32:48 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index 8e6ac51..1515da1 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -4,7 +4,6 @@
> +
> + pbr!=0.7,<1.0,>=0.6
> +
> +-argparse
> + Babel>=1.3
> + iso8601>=0.1.9
> + netaddr>=0.7.12
> +--
> +2.1.0
> +
> diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> index 5c5d98c..de162b7 100644
> --- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> @@ -10,6 +10,7 @@ SRC_URI = "\
>         git://github.com/openstack/python-keystoneclient.git;branch=stable/kilo \
>         file://fix_keystoneclient_memory_leak.patch \
>         file://keystone-api-check.sh \
> +       file://Remove-argparse-from-requirements.txt.patch \
>         "
>
>  PV = "1.3.3+git${SRCPV}"
> diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..10bbef3
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,25 @@
> +From 89ae693563a61acfbed5273a5c9b43b6d98346d5 Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 17:21:27 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index 12f89a0..3966547 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -2,7 +2,6 @@
> + # of appearance. Changing the order has an impact on the overall integration
> + # process, which may cause wedges in the gate later.
> + pbr>=0.6,!=0.7,<1.0
> +-argparse
> + cliff>=1.10.0,<1.11.0  # Apache-2.0
> + iso8601>=0.1.9
> + netaddr>=0.7.12
> +--
> +2.1.0
> +
> diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> index e35be5d..4f9ea33 100644
> --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> @@ -18,11 +18,10 @@ RDEPENDS_${PN} +="python-cliff \
>         python-pbr \
>         "
>
> -PR = "r0"
> -
>  SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \
>             file://neutronclient-use-csv-flag-instead-of-json.patch \
>             file://neutron-api-check.sh \
> +           file://Remove-argparse-from-requirements.txt.patch \
>            "
>
>  PV = "2.4.0+git${SRCPV}"
> diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..8ae80dd
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,25 @@
> +From 0a3e2f3197babcc2488c02b829e744290fac4309 Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 17:25:51 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index 9f20356..6f65859 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -2,7 +2,6 @@
> + # of appearance. Changing the order has an impact on the overall integration
> + # process, which may cause wedges in the gate later.
> + pbr!=0.7,<1.0,>=0.6
> +-argparse
> + iso8601>=0.1.9
> + oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
> + oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
> +--
> +2.1.0
> +
> diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> index 1e60fb4..0045c75 100644
> --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"
>  SRC_URI = "\
>         git://github.com/openstack/python-novaclient.git;branch=stable/kilo \
>         file://nova-api-check.sh \
> +       file://Remove-argparse-from-requirements.txt.patch \
>         "
>
>  PV = "2.23.2+git${SRCPV}"
> diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..b12b048
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,25 @@
> +From 501e153e3d2c4e618a928889626aa49ba636c22f Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 20:51:40 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index 56a2508..da0454e 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -3,7 +3,6 @@
> + # process, which may cause wedges in the gate later.
> +
> + pbr>=0.6,!=0.7,<1.0
> +-argparse
> + netaddr>=0.7.12
> + six>=1.9.0
> + stevedore>=1.1.0  # Apache-2.0
> +--
> +2.1.0
> +
> diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> index 3094b1e..52343cc 100644
> --- a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> +++ b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> @@ -1,13 +1,13 @@
>  DESCRIPTION = "API supporting parsing command line arguments and .ini style configuration files."
> -HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/1.1.0"
> +HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/"
>  SECTION = "devel/python"
>  LICENSE = "Apache-2.0"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
>
> -PR = "r0"
>  SRCNAME = "oslo.config"
>
>  SRC_URI = "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
> +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
>
>  SRC_URI[md5sum] = "109da1307ea8c65440accccbc59cf9a5"
>  SRC_URI[sha256sum] = "ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140"
> diff --git a/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> new file mode 100644
> index 0000000..85b8f14
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> @@ -0,0 +1,23 @@
> +From b1d624241b6d7d2dcd63f5ebe93f79fccd5ad663 Mon Sep 17 00:00:00 2001
> +From: Josep Puigdemont <josep.puigdemont@enea.com>
> +Date: Tue, 24 Nov 2015 20:48:13 +0100
> +Subject: [PATCH] Remove argparse from requirements.txt
> +
> +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> +---
> + requirements.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/requirements.txt b/requirements.txt
> +index f7f4cc9..3a2c63a 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -3,5 +3,4 @@
> + # process, which may cause wedges in the gate later.
> +
> + pbr>=0.6,!=0.7,<1.0
> +-argparse
> + six>=1.9.0
> +--
> +2.1.0
> +
> diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> index 6100f68..d4bf4c0 100644
> --- a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> +++ b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
>  SRC_URI[md5sum] = "e9ed2a1cf91ee76fd9045f902fa58089"
>  SRC_URI[sha256sum] = "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"
>
> +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
> +
>  inherit pypi
>
>  DEPENDS += " \
> --
> 2.5.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization

Re: [meta-cloud-services][fido-kilo][PATCH 42/42] Remove argparse from requirements.txt of some modules

[Josep Puigdemont]

On Tue, Dec 08, 2015 at 08:24:41PM -0500, Mark Asselstine wrote:
> On Tue, Dec 8, 2015 at 12:33 PM, Josep Puigdemont
> <josep.puigdemont@enea.com> wrote:
> > argparse is required by some of the CLI applications of openstack. The
> > module is provided by python 2.7, however python-distribute (used in fido),
> > is not able to find it:
> >
> > Python 2.7.9 (default, Oct 27 2015, 18:12:55)
> > [GCC 4.9.2] on linux2
> > Type "help", "copyright", "credits" or "license" for more information.
> >>>> import pkg_resources
> >>>> pkg_resources.get_distribution('argparse')
> > Traceback (most recent call last):
> >   File "<stdin>", line 1, in <module>
> >   File
> > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > line 338, in get_distribution
> >     if isinstance(dist,Requirement): dist = get_provider(dist)
> >   File
> > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > line 217, in get_provider
> >     return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
> >   File
> > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > line 698, in require
> >     needed = self.resolve(parse_requirements(requirements))
> >   File
> > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > line 596, in resolve
> >     raise DistributionNotFound(req)
> > pkg_resources.DistributionNotFound: argparse
> >>>> import argparse
> >>>>
> >
> > This patch removes argparse from requirements.txt on the python modules
> > used by python-openstackclient, so openstack won't bail out on some
> > circumstances like when doing "openstack -h".
> 
> 
> I have a different solution for this issue in the stuff I am staging
> for master. The same end result but instead of managing patches I
> simply add
> 
> +do_install_append() {
> +    # argparse is stdlib since 2.6 so we can drop this to avoid
> consistency check errors
> +    sed -i '/argparse/d'
> ${D}${libdir}/python2.7/site-packages/${SRCNAME}-${PV}-py2.7.egg-info/requires.txt
> +}
> 
> Or a variation of the above to the recipes which have argparse in the
> requires.txt.
> 
> Your solution is fine but we should probably stick to one. Bruce can
> make the call.

At one point I had this step done as a postprocess command when creating
the image, but your solution is more elegant. Perhaps this could be
implemented in a bbclass, and then just inherit it.

I will let Bruce decide, and then I can resend this patch.

/Josep

> 
> Mark
> 
> 
> >
> > Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > ---
> >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> >  .../python/python-cinderclient_git.bb              |  3 ++-
> >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> >  .../recipes-devtools/python/python-cliff_1.10.0.bb |  1 +
> >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> >  .../python/python-glanceclient_git.bb              |  1 +
> >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> >  .../python/python-keystoneclient_git.bb            |  1 +
> >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> >  .../python/python-neutronclient_git.bb             |  3 +--
> >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> >  .../python/python-novaclient_git.bb                |  1 +
> >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> >  .../python/python-oslo.config_1.9.3.bb             |  4 ++--
> >  .../Remove-argparse-from-requirements.txt.patch    | 23 ++++++++++++++++++++
> >  .../python/python-stevedore_1.3.0.bb               |  2 ++
> >  16 files changed, 209 insertions(+), 5 deletions(-)
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> >  create mode 100644 meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> >
> > diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..0e597a4
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,25 @@
> > +From 7b3f09895c81cf9db0f40dd01e5e1ed5dc5af154 Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 17:30:28 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index 5a66b60..869d6c4 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -2,7 +2,6 @@
> > + # of appearance. Changing the order has an impact on the overall integration
> > + # process, which may cause wedges in the gate later.
> > + pbr!=0.7,<1.0,>=0.6
> > +-argparse
> > + PrettyTable<0.8,>=0.7
> > + python-keystoneclient<1.4.0,>=1.2.0
> > + requests!=2.4.0,>=2.2.0
> > +--
> > +2.1.0
> > +
> > diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > index 951198d..4d8f00f 100644
> > --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > @@ -11,10 +11,11 @@ SRC_URI = "\
> >         git://github.com/openstack/python-cinderclient.git;branch=stable/kilo \
> >         file://fix_cinderclient_memory_leak.patch \
> >         file://cinder-api-check.sh \
> > +       file://Remove-argparse-from-requirements.txt.patch \
> >         "
> >
> >  PV="1.1.2+git${SRCPV}"
> > -SRCREV="b44d32d02b014748044b5b18d27a9d1f8312145c"
> > +SRCREV="36ad09c4fd6af691f0a7c3c47c9876187bcf71c8"
> >  S = "${WORKDIR}/git"
> >
> >  inherit setuptools monitor
> > diff --git a/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..ccf46c8
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,25 @@
> > +From 4246bd70dab5b4da8b3f905ca714ee2ea522c06e Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 20:55:48 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index 754a591..8342cc0 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -2,7 +2,6 @@
> > + # of appearance. Changing the order has an impact on the overall integration
> > + # process, which may cause wedges in the gate later.
> > + pbr>=0.6,!=0.7,<1.0
> > +-argparse
> > + cmd2>=0.6.7
> > + PrettyTable>=0.7,<0.8
> > + pyparsing>=2.0.1
> > +--
> > +2.1.0
> > +
> > 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 e7e1f7e..3843214 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
> > @@ -8,6 +8,7 @@ SRCNAME = "cliff"
> >
> >  SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
> >      file://0001-Fix-object-has-no-attribute-debug-error.patch \
> > +    file://Remove-argparse-from-requirements.txt.patch \
> >      "
> >
> >  SRC_URI[md5sum] = "8f3f67d57bf5a2541efeedcea1aa64ab"
> > diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..387eea5
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,25 @@
> > +From aed6b40f160f6094c5625482e6ce4ddfd96270c0 Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 19:22:02 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index 406fa8d..4021fe3 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -3,7 +3,6 @@
> > + # process, which may cause wedges in the gate later.
> > + pbr!=0.7,<1.0,>=0.6
> > + Babel>=1.3
> > +-argparse
> > + PrettyTable<0.8,>=0.7
> > + python-keystoneclient<1.4.0,>=1.2.0
> > + pyOpenSSL>=0.11
> > +--
> > +2.1.0
> > +
> > diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > index 430e32d..aa231a3 100644
> > --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > @@ -11,6 +11,7 @@ SRC_URI = "\
> >         git://github.com/openstack/${BPN}.git;protocol=https;branch=stable/kilo \
> >         file://fix_glanceclient_memory_leak.patch \
> >         file://glance-api-check.sh \
> > +       file://Remove-argparse-from-requirements.txt.patch \
> >         "
> >
> >  S = "${WORKDIR}/git"
> > diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..6549f05
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,25 @@
> > +From 67d41300eaba99aaad4a058ddf7afd10a8a56368 Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 17:32:48 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index 8e6ac51..1515da1 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -4,7 +4,6 @@
> > +
> > + pbr!=0.7,<1.0,>=0.6
> > +
> > +-argparse
> > + Babel>=1.3
> > + iso8601>=0.1.9
> > + netaddr>=0.7.12
> > +--
> > +2.1.0
> > +
> > diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > index 5c5d98c..de162b7 100644
> > --- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > @@ -10,6 +10,7 @@ SRC_URI = "\
> >         git://github.com/openstack/python-keystoneclient.git;branch=stable/kilo \
> >         file://fix_keystoneclient_memory_leak.patch \
> >         file://keystone-api-check.sh \
> > +       file://Remove-argparse-from-requirements.txt.patch \
> >         "
> >
> >  PV = "1.3.3+git${SRCPV}"
> > diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..10bbef3
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,25 @@
> > +From 89ae693563a61acfbed5273a5c9b43b6d98346d5 Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 17:21:27 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index 12f89a0..3966547 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -2,7 +2,6 @@
> > + # of appearance. Changing the order has an impact on the overall integration
> > + # process, which may cause wedges in the gate later.
> > + pbr>=0.6,!=0.7,<1.0
> > +-argparse
> > + cliff>=1.10.0,<1.11.0  # Apache-2.0
> > + iso8601>=0.1.9
> > + netaddr>=0.7.12
> > +--
> > +2.1.0
> > +
> > diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > index e35be5d..4f9ea33 100644
> > --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > @@ -18,11 +18,10 @@ RDEPENDS_${PN} +="python-cliff \
> >         python-pbr \
> >         "
> >
> > -PR = "r0"
> > -
> >  SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \
> >             file://neutronclient-use-csv-flag-instead-of-json.patch \
> >             file://neutron-api-check.sh \
> > +           file://Remove-argparse-from-requirements.txt.patch \
> >            "
> >
> >  PV = "2.4.0+git${SRCPV}"
> > diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..8ae80dd
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,25 @@
> > +From 0a3e2f3197babcc2488c02b829e744290fac4309 Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 17:25:51 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index 9f20356..6f65859 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -2,7 +2,6 @@
> > + # of appearance. Changing the order has an impact on the overall integration
> > + # process, which may cause wedges in the gate later.
> > + pbr!=0.7,<1.0,>=0.6
> > +-argparse
> > + iso8601>=0.1.9
> > + oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
> > + oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
> > +--
> > +2.1.0
> > +
> > diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > index 1e60fb4..0045c75 100644
> > --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"
> >  SRC_URI = "\
> >         git://github.com/openstack/python-novaclient.git;branch=stable/kilo \
> >         file://nova-api-check.sh \
> > +       file://Remove-argparse-from-requirements.txt.patch \
> >         "
> >
> >  PV = "2.23.2+git${SRCPV}"
> > diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..b12b048
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,25 @@
> > +From 501e153e3d2c4e618a928889626aa49ba636c22f Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 20:51:40 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index 56a2508..da0454e 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -3,7 +3,6 @@
> > + # process, which may cause wedges in the gate later.
> > +
> > + pbr>=0.6,!=0.7,<1.0
> > +-argparse
> > + netaddr>=0.7.12
> > + six>=1.9.0
> > + stevedore>=1.1.0  # Apache-2.0
> > +--
> > +2.1.0
> > +
> > diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > index 3094b1e..52343cc 100644
> > --- a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > +++ b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > @@ -1,13 +1,13 @@
> >  DESCRIPTION = "API supporting parsing command line arguments and .ini style configuration files."
> > -HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/1.1.0"
> > +HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/"
> >  SECTION = "devel/python"
> >  LICENSE = "Apache-2.0"
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
> >
> > -PR = "r0"
> >  SRCNAME = "oslo.config"
> >
> >  SRC_URI = "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
> > +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
> >
> >  SRC_URI[md5sum] = "109da1307ea8c65440accccbc59cf9a5"
> >  SRC_URI[sha256sum] = "ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140"
> > diff --git a/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> > new file mode 100644
> > index 0000000..85b8f14
> > --- /dev/null
> > +++ b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> > @@ -0,0 +1,23 @@
> > +From b1d624241b6d7d2dcd63f5ebe93f79fccd5ad663 Mon Sep 17 00:00:00 2001
> > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > +Date: Tue, 24 Nov 2015 20:48:13 +0100
> > +Subject: [PATCH] Remove argparse from requirements.txt
> > +
> > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > +---
> > + requirements.txt | 1 -
> > + 1 file changed, 1 deletion(-)
> > +
> > +diff --git a/requirements.txt b/requirements.txt
> > +index f7f4cc9..3a2c63a 100644
> > +--- a/requirements.txt
> > ++++ b/requirements.txt
> > +@@ -3,5 +3,4 @@
> > + # process, which may cause wedges in the gate later.
> > +
> > + pbr>=0.6,!=0.7,<1.0
> > +-argparse
> > + six>=1.9.0
> > +--
> > +2.1.0
> > +
> > diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > index 6100f68..d4bf4c0 100644
> > --- a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > +++ b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> >  SRC_URI[md5sum] = "e9ed2a1cf91ee76fd9045f902fa58089"
> >  SRC_URI[sha256sum] = "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"
> >
> > +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
> > +
> >  inherit pypi
> >
> >  DEPENDS += " \
> > --
> > 2.5.0
> >
> > --
> > _______________________________________________
> > meta-virtualization mailing list
> > meta-virtualization@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-virtualization

[meta-cloud-services][fido-kilo][PATCH v2] Use a bbclass to remove argparse from requirements

[Josep Puigdemont]

argparse is required by some of the CLI applications of openstack. The
module is provided by python 2.7, however python-distribute (used in
fido), is not able to find it:

Python 2.7.9 (default, Oct 27 2015, 18:12:55)
[GCC 4.9.2] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import pkg_resources
>>> pkg_resources.get_distribution('argparse')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 338, in get_distribution
    if isinstance(dist,Requirement): dist = get_provider(dist)
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 217, in get_provider
    return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 698, in require
    needed = self.resolve(parse_requirements(requirements))
  File
"/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
line 596, in resolve
    raise DistributionNotFound(req)
pkg_resources.DistributionNotFound: argparse
>>> import argparse
>>>

This patch adds a class that when inherited will remove argparse from
requirements.txt. Also with this patch, those python modules used by
openstackclient inherit the class.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/classes/rmargparse.bbclass                           | 3 +++
 meta-openstack/recipes-devtools/python/python-cinderclient_git.bb   | 2 +-
 meta-openstack/recipes-devtools/python/python-cliff_1.10.0.bb       | 2 +-
 meta-openstack/recipes-devtools/python/python-glanceclient_git.bb   | 2 +-
 meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb | 2 +-
 meta-openstack/recipes-devtools/python/python-neutronclient_git.bb  | 2 +-
 meta-openstack/recipes-devtools/python/python-novaclient_git.bb     | 2 +-
 meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb  | 2 +-
 meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb    | 2 +-
 9 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 meta-openstack/classes/rmargparse.bbclass

diff --git a/meta-openstack/classes/rmargparse.bbclass b/meta-openstack/classes/rmargparse.bbclass
new file mode 100644
index 0000000..65d8459
--- /dev/null
+++ b/meta-openstack/classes/rmargparse.bbclass
@@ -0,0 +1,3 @@
+do_install_append() {
+    sed -i '/argparse/d' ${D}${libdir}/python2.7/site-packages/*/requires.txt
+}
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index 951198d..1590ed4 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -17,7 +17,7 @@ PV="1.1.2+git${SRCPV}"
 SRCREV="b44d32d02b014748044b5b18d27a9d1f8312145c"
 S = "${WORKDIR}/git"
 
-inherit setuptools monitor
+inherit setuptools monitor rmargparse
 
 DEPENDS += " \
         python-pip \
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 e7e1f7e..4a9dc9f 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
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "209882e199fdf98aeed0db44b922aa688e5a66d81c45148a5743804f9a
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit setuptools
+inherit setuptools rmargparse
 
 DEPENDS += " \
 	python-pbr \
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index 430e32d..2ced1e9 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -15,7 +15,7 @@ SRC_URI = "\
 
 S = "${WORKDIR}/git"
 
-inherit setuptools monitor
+inherit setuptools monitor rmargparse
 
 FILES_${PN} += "${datadir}/${SRCNAME}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index 5c5d98c..b538cbf 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -16,7 +16,7 @@ PV = "1.3.3+git${SRCPV}"
 SRCREV = "ec70eb02f8a5889828cde786694283240f64c5c4"
 S = "${WORKDIR}/git"
 
-inherit setuptools monitor
+inherit setuptools monitor rmargparse
 
 FILES_${PN}-doc += "${datadir}/keystoneclient" 
 
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index e35be5d..16a2e92 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -29,7 +29,7 @@ PV = "2.4.0+git${SRCPV}"
 SRCREV = "aa1215a5ad063b299d32ef319eb63d5210249a9b"
 S = "${WORKDIR}/git"
 
-inherit setuptools monitor
+inherit setuptools monitor rmargparse
 
 PACKAGECONFIG ?= "bash-completion"
 PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index 1e60fb4..dd0151a 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -13,7 +13,7 @@ PV = "2.23.2+git${SRCPV}"
 SRCREV = "4ab9db648653f7ea6b9f8b1c78bff672b20b913f"
 S = "${WORKDIR}/git"
 
-inherit setuptools monitor
+inherit setuptools monitor rmargparse
 
 DEPENDS = "python-setuptools-git"
 DEPENDS += " \
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
index 3094b1e..ec1340d 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit setuptools
+inherit setuptools rmargparse
 
 DEPENDS += " \
         python-pbr \
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
index 6100f68..73b054a 100644
--- a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI[md5sum] = "e9ed2a1cf91ee76fd9045f902fa58089"
 SRC_URI[sha256sum] = "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"
 
-inherit pypi
+inherit pypi rmargparse
 
 DEPENDS += " \
         python-pip \
-- 
2.5.0

Re: [meta-cloud-services][fido-kilo][PATCH 42/42] Remove argparse from requirements.txt of some modules

[Josep Puigdemont]

On Wed, Dec 09, 2015 at 08:49:42AM +0100, Josep Puigdemont wrote:
> On Tue, Dec 08, 2015 at 08:24:41PM -0500, Mark Asselstine wrote:
> > On Tue, Dec 8, 2015 at 12:33 PM, Josep Puigdemont
> > <josep.puigdemont@enea.com> wrote:
> > > argparse is required by some of the CLI applications of openstack. The
> > > module is provided by python 2.7, however python-distribute (used in fido),
> > > is not able to find it:
> > >
> > > Python 2.7.9 (default, Oct 27 2015, 18:12:55)
> > > [GCC 4.9.2] on linux2
> > > Type "help", "copyright", "credits" or "license" for more information.
> > >>>> import pkg_resources
> > >>>> pkg_resources.get_distribution('argparse')
> > > Traceback (most recent call last):
> > >   File "<stdin>", line 1, in <module>
> > >   File
> > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > > line 338, in get_distribution
> > >     if isinstance(dist,Requirement): dist = get_provider(dist)
> > >   File
> > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > > line 217, in get_provider
> > >     return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
> > >   File
> > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > > line 698, in require
> > >     needed = self.resolve(parse_requirements(requirements))
> > >   File
> > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_resources.py",
> > > line 596, in resolve
> > >     raise DistributionNotFound(req)
> > > pkg_resources.DistributionNotFound: argparse
> > >>>> import argparse
> > >>>>
> > >
> > > This patch removes argparse from requirements.txt on the python modules
> > > used by python-openstackclient, so openstack won't bail out on some
> > > circumstances like when doing "openstack -h".
> > 
> > 
> > I have a different solution for this issue in the stuff I am staging
> > for master. The same end result but instead of managing patches I
> > simply add
> > 
> > +do_install_append() {
> > +    # argparse is stdlib since 2.6 so we can drop this to avoid
> > consistency check errors
> > +    sed -i '/argparse/d'
> > ${D}${libdir}/python2.7/site-packages/${SRCNAME}-${PV}-py2.7.egg-info/requires.txt
> > +}
> > 
> > Or a variation of the above to the recipes which have argparse in the
> > requires.txt.
> > 
> > Your solution is fine but we should probably stick to one. Bruce can
> > make the call.
> 
> At one point I had this step done as a postprocess command when creating
> the image, but your solution is more elegant. Perhaps this could be
> implemented in a bbclass, and then just inherit it.

I went ahead and implemented a simple bbclass, and sent a replacement
commit for patch 42, in case this works better.

Regards,
/Josep

> 
> I will let Bruce decide, and then I can resend this patch.
> 
> /Josep
> 
> > 
> > Mark
> > 
> > 
> > >
> > > Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > ---
> > >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> > >  .../python/python-cinderclient_git.bb              |  3 ++-
> > >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> > >  .../recipes-devtools/python/python-cliff_1.10.0.bb |  1 +
> > >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> > >  .../python/python-glanceclient_git.bb              |  1 +
> > >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> > >  .../python/python-keystoneclient_git.bb            |  1 +
> > >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> > >  .../python/python-neutronclient_git.bb             |  3 +--
> > >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> > >  .../python/python-novaclient_git.bb                |  1 +
> > >  .../Remove-argparse-from-requirements.txt.patch    | 25 ++++++++++++++++++++++
> > >  .../python/python-oslo.config_1.9.3.bb             |  4 ++--
> > >  .../Remove-argparse-from-requirements.txt.patch    | 23 ++++++++++++++++++++
> > >  .../python/python-stevedore_1.3.0.bb               |  2 ++
> > >  16 files changed, 209 insertions(+), 5 deletions(-)
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> > >  create mode 100644 meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> > >
> > > diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..0e597a4
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,25 @@
> > > +From 7b3f09895c81cf9db0f40dd01e5e1ed5dc5af154 Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 17:30:28 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index 5a66b60..869d6c4 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -2,7 +2,6 @@
> > > + # of appearance. Changing the order has an impact on the overall integration
> > > + # process, which may cause wedges in the gate later.
> > > + pbr!=0.7,<1.0,>=0.6
> > > +-argparse
> > > + PrettyTable<0.8,>=0.7
> > > + python-keystoneclient<1.4.0,>=1.2.0
> > > + requests!=2.4.0,>=2.2.0
> > > +--
> > > +2.1.0
> > > +
> > > diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > > index 951198d..4d8f00f 100644
> > > --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > > +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > > @@ -11,10 +11,11 @@ SRC_URI = "\
> > >         git://github.com/openstack/python-cinderclient.git;branch=stable/kilo \
> > >         file://fix_cinderclient_memory_leak.patch \
> > >         file://cinder-api-check.sh \
> > > +       file://Remove-argparse-from-requirements.txt.patch \
> > >         "
> > >
> > >  PV="1.1.2+git${SRCPV}"
> > > -SRCREV="b44d32d02b014748044b5b18d27a9d1f8312145c"
> > > +SRCREV="36ad09c4fd6af691f0a7c3c47c9876187bcf71c8"
> > >  S = "${WORKDIR}/git"
> > >
> > >  inherit setuptools monitor
> > > diff --git a/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..ccf46c8
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,25 @@
> > > +From 4246bd70dab5b4da8b3f905ca714ee2ea522c06e Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 20:55:48 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index 754a591..8342cc0 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -2,7 +2,6 @@
> > > + # of appearance. Changing the order has an impact on the overall integration
> > > + # process, which may cause wedges in the gate later.
> > > + pbr>=0.6,!=0.7,<1.0
> > > +-argparse
> > > + cmd2>=0.6.7
> > > + PrettyTable>=0.7,<0.8
> > > + pyparsing>=2.0.1
> > > +--
> > > +2.1.0
> > > +
> > > 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 e7e1f7e..3843214 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
> > > @@ -8,6 +8,7 @@ SRCNAME = "cliff"
> > >
> > >  SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
> > >      file://0001-Fix-object-has-no-attribute-debug-error.patch \
> > > +    file://Remove-argparse-from-requirements.txt.patch \
> > >      "
> > >
> > >  SRC_URI[md5sum] = "8f3f67d57bf5a2541efeedcea1aa64ab"
> > > diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..387eea5
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,25 @@
> > > +From aed6b40f160f6094c5625482e6ce4ddfd96270c0 Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 19:22:02 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index 406fa8d..4021fe3 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -3,7 +3,6 @@
> > > + # process, which may cause wedges in the gate later.
> > > + pbr!=0.7,<1.0,>=0.6
> > > + Babel>=1.3
> > > +-argparse
> > > + PrettyTable<0.8,>=0.7
> > > + python-keystoneclient<1.4.0,>=1.2.0
> > > + pyOpenSSL>=0.11
> > > +--
> > > +2.1.0
> > > +
> > > diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > > index 430e32d..aa231a3 100644
> > > --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > > +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > > @@ -11,6 +11,7 @@ SRC_URI = "\
> > >         git://github.com/openstack/${BPN}.git;protocol=https;branch=stable/kilo \
> > >         file://fix_glanceclient_memory_leak.patch \
> > >         file://glance-api-check.sh \
> > > +       file://Remove-argparse-from-requirements.txt.patch \
> > >         "
> > >
> > >  S = "${WORKDIR}/git"
> > > diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..6549f05
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,25 @@
> > > +From 67d41300eaba99aaad4a058ddf7afd10a8a56368 Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 17:32:48 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index 8e6ac51..1515da1 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -4,7 +4,6 @@
> > > +
> > > + pbr!=0.7,<1.0,>=0.6
> > > +
> > > +-argparse
> > > + Babel>=1.3
> > > + iso8601>=0.1.9
> > > + netaddr>=0.7.12
> > > +--
> > > +2.1.0
> > > +
> > > diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > > index 5c5d98c..de162b7 100644
> > > --- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > > +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > > @@ -10,6 +10,7 @@ SRC_URI = "\
> > >         git://github.com/openstack/python-keystoneclient.git;branch=stable/kilo \
> > >         file://fix_keystoneclient_memory_leak.patch \
> > >         file://keystone-api-check.sh \
> > > +       file://Remove-argparse-from-requirements.txt.patch \
> > >         "
> > >
> > >  PV = "1.3.3+git${SRCPV}"
> > > diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..10bbef3
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,25 @@
> > > +From 89ae693563a61acfbed5273a5c9b43b6d98346d5 Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 17:21:27 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index 12f89a0..3966547 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -2,7 +2,6 @@
> > > + # of appearance. Changing the order has an impact on the overall integration
> > > + # process, which may cause wedges in the gate later.
> > > + pbr>=0.6,!=0.7,<1.0
> > > +-argparse
> > > + cliff>=1.10.0,<1.11.0  # Apache-2.0
> > > + iso8601>=0.1.9
> > > + netaddr>=0.7.12
> > > +--
> > > +2.1.0
> > > +
> > > diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > > index e35be5d..4f9ea33 100644
> > > --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > > +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > > @@ -18,11 +18,10 @@ RDEPENDS_${PN} +="python-cliff \
> > >         python-pbr \
> > >         "
> > >
> > > -PR = "r0"
> > > -
> > >  SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \
> > >             file://neutronclient-use-csv-flag-instead-of-json.patch \
> > >             file://neutron-api-check.sh \
> > > +           file://Remove-argparse-from-requirements.txt.patch \
> > >            "
> > >
> > >  PV = "2.4.0+git${SRCPV}"
> > > diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..8ae80dd
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,25 @@
> > > +From 0a3e2f3197babcc2488c02b829e744290fac4309 Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 17:25:51 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index 9f20356..6f65859 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -2,7 +2,6 @@
> > > + # of appearance. Changing the order has an impact on the overall integration
> > > + # process, which may cause wedges in the gate later.
> > > + pbr!=0.7,<1.0,>=0.6
> > > +-argparse
> > > + iso8601>=0.1.9
> > > + oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
> > > + oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
> > > +--
> > > +2.1.0
> > > +
> > > diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > > index 1e60fb4..0045c75 100644
> > > --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > > +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > > @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"
> > >  SRC_URI = "\
> > >         git://github.com/openstack/python-novaclient.git;branch=stable/kilo \
> > >         file://nova-api-check.sh \
> > > +       file://Remove-argparse-from-requirements.txt.patch \
> > >         "
> > >
> > >  PV = "2.23.2+git${SRCPV}"
> > > diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..b12b048
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,25 @@
> > > +From 501e153e3d2c4e618a928889626aa49ba636c22f Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 20:51:40 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index 56a2508..da0454e 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -3,7 +3,6 @@
> > > + # process, which may cause wedges in the gate later.
> > > +
> > > + pbr>=0.6,!=0.7,<1.0
> > > +-argparse
> > > + netaddr>=0.7.12
> > > + six>=1.9.0
> > > + stevedore>=1.1.0  # Apache-2.0
> > > +--
> > > +2.1.0
> > > +
> > > diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > > index 3094b1e..52343cc 100644
> > > --- a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > > +++ b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > > @@ -1,13 +1,13 @@
> > >  DESCRIPTION = "API supporting parsing command line arguments and .ini style configuration files."
> > > -HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/1.1.0"
> > > +HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/"
> > >  SECTION = "devel/python"
> > >  LICENSE = "Apache-2.0"
> > >  LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
> > >
> > > -PR = "r0"
> > >  SRCNAME = "oslo.config"
> > >
> > >  SRC_URI = "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
> > > +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
> > >
> > >  SRC_URI[md5sum] = "109da1307ea8c65440accccbc59cf9a5"
> > >  SRC_URI[sha256sum] = "ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140"
> > > diff --git a/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> > > new file mode 100644
> > > index 0000000..85b8f14
> > > --- /dev/null
> > > +++ b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
> > > @@ -0,0 +1,23 @@
> > > +From b1d624241b6d7d2dcd63f5ebe93f79fccd5ad663 Mon Sep 17 00:00:00 2001
> > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +Date: Tue, 24 Nov 2015 20:48:13 +0100
> > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > +
> > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > +---
> > > + requirements.txt | 1 -
> > > + 1 file changed, 1 deletion(-)
> > > +
> > > +diff --git a/requirements.txt b/requirements.txt
> > > +index f7f4cc9..3a2c63a 100644
> > > +--- a/requirements.txt
> > > ++++ b/requirements.txt
> > > +@@ -3,5 +3,4 @@
> > > + # process, which may cause wedges in the gate later.
> > > +
> > > + pbr>=0.6,!=0.7,<1.0
> > > +-argparse
> > > + six>=1.9.0
> > > +--
> > > +2.1.0
> > > +
> > > diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > > index 6100f68..d4bf4c0 100644
> > > --- a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > > +++ b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > > @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> > >  SRC_URI[md5sum] = "e9ed2a1cf91ee76fd9045f902fa58089"
> > >  SRC_URI[sha256sum] = "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"
> > >
> > > +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
> > > +
> > >  inherit pypi
> > >
> > >  DEPENDS += " \
> > > --
> > > 2.5.0
> > >
> > > --
> > > _______________________________________________
> > > meta-virtualization mailing list
> > > meta-virtualization@yoctoproject.org
> > > https://lists.yoctoproject.org/listinfo/meta-virtualization
> -- 
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization

Re: [meta-cloud-services][fido-kilo][PATCH 42/42] Remove argparse from requirements.txt of some modules

[Mark Asselstine]

On December 9, 2015 01:42:45 PM Josep Puigdemont wrote:
> On Wed, Dec 09, 2015 at 08:49:42AM +0100, Josep Puigdemont wrote:
> > On Tue, Dec 08, 2015 at 08:24:41PM -0500, Mark Asselstine wrote:
> > > On Tue, Dec 8, 2015 at 12:33 PM, Josep Puigdemont
> > > 
> > > <josep.puigdemont@enea.com> wrote:
> > > > argparse is required by some of the CLI applications of openstack. The
> > > > module is provided by python 2.7, however python-distribute (used in
> > > > fido),
> > > > is not able to find it:
> > > > 
> > > > Python 2.7.9 (default, Oct 27 2015, 18:12:55)
> > > > [GCC 4.9.2] on linux2
> > > > Type "help", "copyright", "credits" or "license" for more information.
> > > > 
> > > >>>> import pkg_resources
> > > >>>> pkg_resources.get_distribution('argparse')
> > > > 
> > > > Traceback (most recent call last):
> > > >   File "<stdin>", line 1, in <module>
> > > >   File
> > > > 
> > > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_reso
> > > > urces.py", line 338, in get_distribution
> > > > 
> > > >     if isinstance(dist,Requirement): dist = get_provider(dist)
> > > >   
> > > >   File
> > > > 
> > > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_reso
> > > > urces.py", line 217, in get_provider
> > > > 
> > > >     return working_set.find(moduleOrReq) or
> > > >     require(str(moduleOrReq))[0]
> > > >   
> > > >   File
> > > > 
> > > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_reso
> > > > urces.py", line 698, in require
> > > > 
> > > >     needed = self.resolve(parse_requirements(requirements))
> > > >   
> > > >   File
> > > > 
> > > > "/usr/lib/python2.7/site-packages/distribute-0.6.49-py2.7.egg/pkg_reso
> > > > urces.py", line 596, in resolve
> > > > 
> > > >     raise DistributionNotFound(req)
> > > > 
> > > > pkg_resources.DistributionNotFound: argparse
> > > > 
> > > >>>> import argparse
> > > > 
> > > > This patch removes argparse from requirements.txt on the python
> > > > modules
> > > > used by python-openstackclient, so openstack won't bail out on some
> > > > circumstances like when doing "openstack -h".
> > > 
> > > I have a different solution for this issue in the stuff I am staging
> > > for master. The same end result but instead of managing patches I
> > > simply add
> > > 
> > > +do_install_append() {
> > > +    # argparse is stdlib since 2.6 so we can drop this to avoid
> > > consistency check errors
> > > +    sed -i '/argparse/d'
> > > ${D}${libdir}/python2.7/site-packages/${SRCNAME}-${PV}-py2.7.egg-info/re
> > > quires.txt +}
> > > 
> > > Or a variation of the above to the recipes which have argparse in the
> > > requires.txt.
> > > 
> > > Your solution is fine but we should probably stick to one. Bruce can
> > > make the call.
> > 
> > At one point I had this step done as a postprocess command when creating
> > the image, but your solution is more elegant. Perhaps this could be
> > implemented in a bbclass, and then just inherit it.
> 
> I went ahead and implemented a simple bbclass, and sent a replacement
> commit for patch 42, in case this works better.
> 

Perfect. Once Bruce merges it I will use this on master.

Thanks,
Mark

> Regards,
> /Josep
> 
> > I will let Bruce decide, and then I can resend this patch.
> > 
> > /Josep
> > 
> > > Mark
> > > 
> > > > Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > ---
> > > > 
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 25
> > > >  ++++++++++++++++++++++ .../python/python-cinderclient_git.bb        
> > > >       |  3 ++-
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 25
> > > >  ++++++++++++++++++++++
> > > >  .../recipes-devtools/python/python-cliff_1.10.0.bb |  1 +
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 25
> > > >  ++++++++++++++++++++++ .../python/python-glanceclient_git.bb        
> > > >       |  1 +
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 25
> > > >  ++++++++++++++++++++++ .../python/python-keystoneclient_git.bb      
> > > >       |  1 +
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 25
> > > >  ++++++++++++++++++++++ .../python/python-neutronclient_git.bb       
> > > >       |  3 +--
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 25
> > > >  ++++++++++++++++++++++ .../python/python-novaclient_git.bb          
> > > >       |  1 +
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 25
> > > >  ++++++++++++++++++++++ .../python/python-oslo.config_1.9.3.bb       
> > > >       |  4 ++--
> > > >  .../Remove-argparse-from-requirements.txt.patch    | 23
> > > >  ++++++++++++++++++++ .../python/python-stevedore_1.3.0.bb           
> > > >     |  2 ++
> > > >  16 files changed, 209 insertions(+), 5 deletions(-)
> > > >  create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-cinderclient/Remove-ar
> > > >  gparse-from-requirements.txt.patch create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-
> > > >  from-requirements.txt.patch create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-glanceclient/Remove-ar
> > > >  gparse-from-requirements.txt.patch create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-
> > > >  argparse-from-requirements.txt.patch create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-neutronclient/Remove-a
> > > >  rgparse-from-requirements.txt.patch create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-novaclient/Remove-argp
> > > >  arse-from-requirements.txt.patch create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-oslo.config/Remove-arg
> > > >  parse-from-requirements.txt.patch create mode 100644
> > > >  meta-openstack/recipes-devtools/python/python-stevedore/Remove-argpa
> > > >  rse-from-requirements.txt.patch> > > 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-a
> > > > rgparse-from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-a
> > > > rgparse-from-requirements.txt.patch new file mode 100644
> > > > index 0000000..0e597a4
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-cinderclient/Remove-a
> > > > rgparse-from-requirements.txt.patch @@ -0,0 +1,25 @@
> > > > +From 7b3f09895c81cf9db0f40dd01e5e1ed5dc5af154 Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 17:30:28 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index 5a66b60..869d6c4 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -2,7 +2,6 @@
> > > > + # of appearance. Changing the order has an impact on the overall
> > > > integration + # process, which may cause wedges in the gate later.
> > > > + pbr!=0.7,<1.0,>=0.6
> > > > +-argparse
> > > > + PrettyTable<0.8,>=0.7
> > > > + python-keystoneclient<1.4.0,>=1.2.0
> > > > + requests!=2.4.0,>=2.2.0
> > > > +--
> > > > +2.1.0
> > > > +
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > > > b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > > > index 951198d..4d8f00f 100644
> > > > ---
> > > > a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
> > > > @@ -11,10 +11,11 @@ SRC_URI = "\
> > > > 
> > > >         git://github.com/openstack/python-cinderclient.git;branch=stab
> > > >         le/kilo \
> > > >         file://fix_cinderclient_memory_leak.patch \
> > > >         file://cinder-api-check.sh \
> > > > 
> > > > +       file://Remove-argparse-from-requirements.txt.patch \
> > > > 
> > > >         "
> > > >  
> > > >  PV="1.1.2+git${SRCPV}"
> > > > 
> > > > -SRCREV="b44d32d02b014748044b5b18d27a9d1f8312145c"
> > > > +SRCREV="36ad09c4fd6af691f0a7c3c47c9876187bcf71c8"
> > > > 
> > > >  S = "${WORKDIR}/git"
> > > >  
> > > >  inherit setuptools monitor
> > > > 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse
> > > > -from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse
> > > > -from-requirements.txt.patch new file mode 100644
> > > > index 0000000..ccf46c8
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse
> > > > -from-requirements.txt.patch @@ -0,0 +1,25 @@
> > > > +From 4246bd70dab5b4da8b3f905ca714ee2ea522c06e Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 20:55:48 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index 754a591..8342cc0 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -2,7 +2,6 @@
> > > > + # of appearance. Changing the order has an impact on the overall
> > > > integration + # process, which may cause wedges in the gate later.
> > > > + pbr>=0.6,!=0.7,<1.0
> > > > +-argparse
> > > > + cmd2>=0.6.7
> > > > + PrettyTable>=0.7,<0.8
> > > > + pyparsing>=2.0.1
> > > > +--
> > > > +2.1.0
> > > > +
> > > > 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
> > > > e7e1f7e..3843214 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
> > > > @@ -8,6 +8,7 @@ SRCNAME = "cliff"
> > > > 
> > > >  SRC_URI =
> > > >  "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${P
> > > >  V}.tar.gz \> > >  
> > > >      file://0001-Fix-object-has-no-attribute-debug-error.patch \
> > > > 
> > > > +    file://Remove-argparse-from-requirements.txt.patch \
> > > > 
> > > >      "
> > > >  
> > > >  SRC_URI[md5sum] = "8f3f67d57bf5a2541efeedcea1aa64ab"
> > > > 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-a
> > > > rgparse-from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-a
> > > > rgparse-from-requirements.txt.patch new file mode 100644
> > > > index 0000000..387eea5
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-glanceclient/Remove-a
> > > > rgparse-from-requirements.txt.patch @@ -0,0 +1,25 @@
> > > > +From aed6b40f160f6094c5625482e6ce4ddfd96270c0 Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 19:22:02 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index 406fa8d..4021fe3 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -3,7 +3,6 @@
> > > > + # process, which may cause wedges in the gate later.
> > > > + pbr!=0.7,<1.0,>=0.6
> > > > + Babel>=1.3
> > > > +-argparse
> > > > + PrettyTable<0.8,>=0.7
> > > > + python-keystoneclient<1.4.0,>=1.2.0
> > > > + pyOpenSSL>=0.11
> > > > +--
> > > > +2.1.0
> > > > +
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > > > b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > > > index 430e32d..aa231a3 100644
> > > > ---
> > > > a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
> > > > @@ -11,6 +11,7 @@ SRC_URI = "\
> > > > 
> > > >         git://github.com/openstack/${BPN}.git;protocol=https;branch=st
> > > >         able/kilo \
> > > >         file://fix_glanceclient_memory_leak.patch \
> > > >         file://glance-api-check.sh \
> > > > 
> > > > +       file://Remove-argparse-from-requirements.txt.patch \
> > > > 
> > > >         "
> > > >  
> > > >  S = "${WORKDIR}/git"
> > > > 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove
> > > > -argparse-from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove
> > > > -argparse-from-requirements.txt.patch new file mode 100644
> > > > index 0000000..6549f05
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-keystoneclient/Remove
> > > > -argparse-from-requirements.txt.patch @@ -0,0 +1,25 @@
> > > > +From 67d41300eaba99aaad4a058ddf7afd10a8a56368 Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 17:32:48 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index 8e6ac51..1515da1 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -4,7 +4,6 @@
> > > > +
> > > > + pbr!=0.7,<1.0,>=0.6
> > > > +
> > > > +-argparse
> > > > + Babel>=1.3
> > > > + iso8601>=0.1.9
> > > > + netaddr>=0.7.12
> > > > +--
> > > > +2.1.0
> > > > +
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > > > b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > > > index 5c5d98c..de162b7 100644
> > > > ---
> > > > a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
> > > > @@ -10,6 +10,7 @@ SRC_URI = "\
> > > > 
> > > >         git://github.com/openstack/python-keystoneclient.git;branch=st
> > > >         able/kilo \
> > > >         file://fix_keystoneclient_memory_leak.patch \
> > > >         file://keystone-api-check.sh \
> > > > 
> > > > +       file://Remove-argparse-from-requirements.txt.patch \
> > > > 
> > > >         "
> > > >  
> > > >  PV = "1.3.3+git${SRCPV}"
> > > > 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-
> > > > argparse-from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-
> > > > argparse-from-requirements.txt.patch new file mode 100644
> > > > index 0000000..10bbef3
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-neutronclient/Remove-
> > > > argparse-from-requirements.txt.patch @@ -0,0 +1,25 @@
> > > > +From 89ae693563a61acfbed5273a5c9b43b6d98346d5 Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 17:21:27 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index 12f89a0..3966547 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -2,7 +2,6 @@
> > > > + # of appearance. Changing the order has an impact on the overall
> > > > integration + # process, which may cause wedges in the gate later.
> > > > + pbr>=0.6,!=0.7,<1.0
> > > > +-argparse
> > > > + cliff>=1.10.0,<1.11.0  # Apache-2.0
> > > > + iso8601>=0.1.9
> > > > + netaddr>=0.7.12
> > > > +--
> > > > +2.1.0
> > > > +
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > > > b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > > > index e35be5d..4f9ea33 100644
> > > > ---
> > > > a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
> > > > @@ -18,11 +18,10 @@ RDEPENDS_${PN} +="python-cliff \
> > > > 
> > > >         python-pbr \
> > > >         "
> > > > 
> > > > -PR = "r0"
> > > > -
> > > > 
> > > >  SRC_URI =
> > > >  "git://github.com/openstack/python-neutronclient.git;branch=master \> 
> >  
> > > >             file://neutronclient-use-csv-flag-instead-of-json.patch \
> > > >             file://neutron-api-check.sh \
> > > > 
> > > > +           file://Remove-argparse-from-requirements.txt.patch \
> > > > 
> > > >            "
> > > >  
> > > >  PV = "2.4.0+git${SRCPV}"
> > > > 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-novaclient/Remove-arg
> > > > parse-from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-arg
> > > > parse-from-requirements.txt.patch new file mode 100644
> > > > index 0000000..8ae80dd
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-novaclient/Remove-arg
> > > > parse-from-requirements.txt.patch @@ -0,0 +1,25 @@
> > > > +From 0a3e2f3197babcc2488c02b829e744290fac4309 Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 17:25:51 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index 9f20356..6f65859 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -2,7 +2,6 @@
> > > > + # of appearance. Changing the order has an impact on the overall
> > > > integration + # process, which may cause wedges in the gate later.
> > > > + pbr!=0.7,<1.0,>=0.6
> > > > +-argparse
> > > > + iso8601>=0.1.9
> > > > + oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
> > > > + oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
> > > > +--
> > > > +2.1.0
> > > > +
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > > > b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > > > index 1e60fb4..0045c75 100644
> > > > --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > > > +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
> > > > @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
> > > > "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"> > > 
> > > >  SRC_URI = "\
> > > >  
> > > >         git://github.com/openstack/python-novaclient.git;branch=stable
> > > >         /kilo \
> > > >         file://nova-api-check.sh \
> > > > 
> > > > +       file://Remove-argparse-from-requirements.txt.patch \
> > > > 
> > > >         "
> > > >  
> > > >  PV = "2.23.2+git${SRCPV}"
> > > > 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-ar
> > > > gparse-from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-ar
> > > > gparse-from-requirements.txt.patch new file mode 100644
> > > > index 0000000..b12b048
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-oslo.config/Remove-ar
> > > > gparse-from-requirements.txt.patch @@ -0,0 +1,25 @@
> > > > +From 501e153e3d2c4e618a928889626aa49ba636c22f Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 20:51:40 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index 56a2508..da0454e 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -3,7 +3,6 @@
> > > > + # process, which may cause wedges in the gate later.
> > > > +
> > > > + pbr>=0.6,!=0.7,<1.0
> > > > +-argparse
> > > > + netaddr>=0.7.12
> > > > + six>=1.9.0
> > > > + stevedore>=1.1.0  # Apache-2.0
> > > > +--
> > > > +2.1.0
> > > > +
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > > > b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > > > index 3094b1e..52343cc 100644
> > > > ---
> > > > a/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
> > > > @@ -1,13 +1,13 @@
> > > > 
> > > >  DESCRIPTION = "API supporting parsing command line arguments and .ini
> > > >  style configuration files."> > > 
> > > > -HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/1.1.0"
> > > > +HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/"
> > > > 
> > > >  SECTION = "devel/python"
> > > >  LICENSE = "Apache-2.0"
> > > >  LIC_FILES_CHKSUM =
> > > >  "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
> > > > 
> > > > -PR = "r0"
> > > > 
> > > >  SRCNAME = "oslo.config"
> > > >  
> > > >  SRC_URI =
> > > >  "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${P
> > > >  V}.tar.gz"> > > 
> > > > +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
> > > > 
> > > >  SRC_URI[md5sum] = "109da1307ea8c65440accccbc59cf9a5"
> > > >  SRC_URI[sha256sum] =
> > > >  "ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140"> > 
> 
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argp
> > > > arse-from-requirements.txt.patch
> > > > b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argp
> > > > arse-from-requirements.txt.patch new file mode 100644
> > > > index 0000000..85b8f14
> > > > --- /dev/null
> > > > +++
> > > > b/meta-openstack/recipes-devtools/python/python-stevedore/Remove-argp
> > > > arse-from-requirements.txt.patch @@ -0,0 +1,23 @@
> > > > +From b1d624241b6d7d2dcd63f5ebe93f79fccd5ad663 Mon Sep 17 00:00:00
> > > > 2001
> > > > +From: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +Date: Tue, 24 Nov 2015 20:48:13 +0100
> > > > +Subject: [PATCH] Remove argparse from requirements.txt
> > > > +
> > > > +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
> > > > +---
> > > > + requirements.txt | 1 -
> > > > + 1 file changed, 1 deletion(-)
> > > > +
> > > > +diff --git a/requirements.txt b/requirements.txt
> > > > +index f7f4cc9..3a2c63a 100644
> > > > +--- a/requirements.txt
> > > > ++++ b/requirements.txt
> > > > +@@ -3,5 +3,4 @@
> > > > + # process, which may cause wedges in the gate later.
> > > > +
> > > > + pbr>=0.6,!=0.7,<1.0
> > > > +-argparse
> > > > + six>=1.9.0
> > > > +--
> > > > +2.1.0
> > > > +
> > > > diff --git
> > > > a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > > > b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > > > index 6100f68..d4bf4c0 100644
> > > > --- a/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > > > +++ b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
> > > > @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM =
> > > > "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"> > > 
> > > >  SRC_URI[md5sum] = "e9ed2a1cf91ee76fd9045f902fa58089"
> > > >  SRC_URI[sha256sum] =
> > > >  "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"> > 
> 
> > > > +SRC_URI += "file://Remove-argparse-from-requirements.txt.patch"
> > > > +
> > > > 
> > > >  inherit pypi
> > > >  
> > > >  DEPENDS += " \
> > > > 
> > > > --
> > > > 2.5.0
> > > > 
> > > > --
> > > > _______________________________________________
> > > > meta-virtualization mailing list
> > > > meta-virtualization@yoctoproject.org
> > > > https://lists.yoctoproject.org/listinfo/meta-virtualization
> > 
> > --
> > _______________________________________________
> > meta-virtualization mailing list
> > meta-virtualization@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-virtualization

Re: [meta-cloud-services][fido-kilo][PATCH 00/42] Updates for fido-kilo

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 11433 bytes --]

On Tue, Dec 8, 2015 at 12:33 PM, Josep Puigdemont <josep.puigdemont@enea.com
> wrote:

> Hi,
>
> A few comments on this patch series:
>
> * It contains several cherry-picks from master that are also needed in
> fido-kilo.
>
> * I had to cherry-pick django-pyscss 2.0.2 from master, although Kilo's
> requirements have a cap on this package (>=1.0.3,<2.0.0), but horizon
> wouldn't work otherwise.
>
> * There are also a few upgrades to Openstack Kilo 2015.1.2 that were
> missing
> from the previous series (and a new recipe for oslo.versionedobjects).
>
> * Various dependencies have been added, and NAT as well as TUN kernel
> modules
> are added to the compute image too.
>
> * The last pacth is the only one I think may be a bit controversial
> (because
> it's rather ugly). Maybe you have some suggestions on how to solve the
> issue
> described in the commit message. I have put everything in one patch so it
> is
> easy to remove later, or to discard altogether. Without this patch the
> images
> won't work out of the box, but it can be fixed by adding a simple sed
> command
> to IMAGE_POSTPROCESS_COMMAND that does the same.
>
>
> I have tested this using both the AIO image and comupte+controller images
> on qemu. Only the AIO image has been tested on real HW.
>
> I'm sorry for the large patch sets! I believe this is the last series for
> fido-kilo I have. I hope I can work with master and Liberty pretty soon.
>


I've merged the series to fido-kilo, with the v2 class used for argparse
fixups.

I also cherry picked a modified version of the class to master, so we can
start
using it there for fixups as well.

Cheers,

Bruce


>
> Thanks,
>
> /Josep
>
> Jackie Huang (8):
>   python-pathlib: add new recipe
>   python-django-pyscss: add missing rdepends on python-pathlib
>   python-enum: add new recipe
>   python-pyscss: add missing rdepends on python-enum
>   python-repoze.lru: add new recipe
>   python-routes: add rdepends on python-repoze.lru
>   python-nova: add missing rdepends
>   python-eventlet: upgrade 0.17.1 -> 0.17.4
>
> Josep Puigdemont (12):
>   python-sqlalchemy-migrate: depends on sqlparse
>   python-cliff: Fix object has no attribute debug error
>   python-nova: dependency on blkid
>   yocto-kernel: enable NAT
>   python-pbr: upgrade to 0.11
>   python-novaclient: upgrade to 2.23.2
>   python-ceilometer: upgrade to 2015.1.2
>   python-oslo.versionedobjects: added recipe
>   python-heat: update to 2015.1.2
>   packagegroup-cloud-compute: add tun kernel module
>   packagegroup-cloud-extras: include xterm only if x11 in
>     DISTRO_FEATURES
>   Remove argparse from requirements.txt of some modules
>
> Lei Maohui (3):
>   python-beautifulsoup4: upgrade 4.3.2 -> 4.4.0
>   python-sqlalchemy-migrate: upgrade 0.9.6->0.9.7
>   python-testtools: upgrade 0.9.33 -> 1.8.0
>
> Li xin (10):
>   python-setuptools-git: add native support
>   python-httpretty: upgrade 0.8.7 -> 0.8.10
>   python-jsonpatch: upgrade 1.9 -> 1.11
>   python-jsonpointer: upgrade 1.7 -> 1.9
>   python-msgpack: upgrade 0.4.5 -> 0.4.6
>   python-pecan: upgrade 0.8.3 -> 0.9.0
>   json: upgrade 1.8.1 -> 1.8.3
>   ruby.bbclass: Error fix
>   python-vcversioner: add new recipe
>   python-jsonschema: upgrade 2.4.0 -> 2.5.1
>
> Mark Asselstine (9):
>   python-nova: add missing dependency on sqlparse
>   meta-openstack: add wildcard to libvirt bbappend
>   libvirt: remove sanlock from PACKAGECONFIG
>   glance: add new dependencies
>   keystone: the 'sql' section is deprecated
>   python-testtools: fix build error
>   keystone: add missing functools32 module
>   django-pyscss: uprev to version 2.0.2
>   openvswitch: add as RRECOMMENDS for compute and controller
>
>  meta-openstack/classes/ruby.bbclass                |  1 +
>  ...up4_4.3.2.bb => python-beautifulsoup4_4.4.0.bb} |  6 ++--
>  .../python/python-ceilometer_git.bb                |  7 ++---
>  .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
>  .../python/python-cinderclient_git.bb              |  3 +-
>  ...1-Fix-object-has-no-attribute-debug-error.patch | 32
> ++++++++++++++++++++++
>  .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
>  .../recipes-devtools/python/python-cliff_1.10.0.bb |  6 ++--
>  ...scss_1.0.6.bb => python-django-pyscss_2.0.2.bb} |  6 ++--
>  .../recipes-devtools/python/python-enum_0.4.4.bb   | 25 +++++++++++++++++
>  ...ventlet_0.17.1.bb => python-eventlet_0.17.4.bb} |  5 ++--
>  .../python/python-functools32_3.2.3-2.bb           | 29
> ++++++++++++++++++++
>  .../recipes-devtools/python/python-glance_git.bb   |  3 ++
>  .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
>  .../python/python-glanceclient_git.bb              |  1 +
>  .../recipes-devtools/python/python-heat_git.bb     |  8 +++---
>  ...tpretty_0.8.7.bb => python-httpretty_0.8.10.bb} |  4 +--
>  ...n-jsonpatch_1.9.bb => python-jsonpatch_1.11.bb} |  4 +--
>  ...sonpointer_1.7.bb => python-jsonpointer_1.9.bb} |  4 +--
>  ...nschema_2.4.0.bb => python-jsonschema_2.5.1.bb} |  6 ++--
>  .../python/python-keystone/keystone.conf           |  2 +-
>  .../recipes-devtools/python/python-keystone_git.bb |  1 +
>  .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
>  .../python/python-keystoneclient_git.bb            |  1 +
>  ...on-msgpack_0.4.5.bb => python-msgpack_0.4.6.bb} |  4 +--
>  .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
>  .../python/python-neutronclient_git.bb             |  3 +-
>  .../recipes-devtools/python/python-nova_git.bb     |  8 +++++-
>  .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
>  .../python/python-novaclient_git.bb                |  9 +++---
>  .../Remove-argparse-from-requirements.txt.patch    | 25 +++++++++++++++++
>  .../python/python-oslo.config_1.9.3.bb             |  4 +--
>  .../python/python-oslo.versionedobjects_0.1.1.bb   | 26
> ++++++++++++++++++
>  .../python/python-pathlib_1.0.1.bb                 | 29
> ++++++++++++++++++++
>  .../{python-pbr_0.10.8.bb => python-pbr_0.11.0.bb} |  8 ++----
>  ...python-pecan_0.8.3.bb => python-pecan_0.9.0.bb} |  4 +--
>  .../recipes-devtools/python/python-pyscss_1.3.4.bb |  1 +
>  .../python/python-repoze.lru_0.6.bb                | 20 ++++++++++++++
>  .../python/python-routes_1.12.3.bb                 |  2 +-
>  .../python/python-semantic-version_2.4.2.bb        | 27
> ++++++++++++++++++
>  .../python/python-setuptools-git_1.1.bb            |  1 +
>  ...0.9.6.bb => python-sqlalchemy-migrate_0.9.7.bb} |  5 ++--
>  .../python/python-sqlparse_0.1.16.bb               | 27
> ++++++++++++++++++
>  .../Remove-argparse-from-requirements.txt.patch    | 23 ++++++++++++++++
>  .../python/python-stevedore_1.3.0.bb               |  2 ++
>  ...sttools_0.9.33.bb => python-testtools_1.8.0.bb} |  8 ++++--
>  .../python/python-vcversioner_2.14.0.0.bb          | 16 +++++++++++
>  .../ruby/json/0001-Dont-compile-extensions.patch   | 20 --------------
>  meta-openstack/recipes-devtools/ruby/json_git.bb   |  5 ++--
>  ...ibvirt_1.2.12.bbappend => libvirt_1.%.bbappend} |  2 +-
>  .../packagegroups/packagegroup-cloud-compute.bb    |  2 ++
>  .../packagegroups/packagegroup-cloud-controller.bb |  1 +
>  .../packagegroups/packagegroup-cloud-extras.bb     |  2 +-
>  .../recipes-kernel/linux/linux-yocto/nf.cfg        |  1 +
>  54 files changed, 510 insertions(+), 79 deletions(-)
>  rename meta-openstack/recipes-devtools/python/{
> python-beautifulsoup4_4.3.2.bb => python-beautifulsoup4_4.4.0.bb} (71%)
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-cinderclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-cliff/0001-Fix-object-has-no-attribute-debug-error.patch
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-cliff/Remove-argparse-from-requirements.txt.patch
>  rename meta-openstack/recipes-devtools/python/{
> python-django-pyscss_1.0.6.bb => python-django-pyscss_2.0.2.bb} (77%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-enum_0.4.4.bb
>  rename meta-openstack/recipes-devtools/python/{python-eventlet_0.17.1.bb
> => python-eventlet_0.17.4.bb} (71%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-functools32_3.2.3-2.bb
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-glanceclient/Remove-argparse-from-requirements.txt.patch
>  rename meta-openstack/recipes-devtools/python/{python-httpretty_0.8.7.bb
> => python-httpretty_0.8.10.bb} (78%)
>  rename meta-openstack/recipes-devtools/python/{python-jsonpatch_1.9.bb
> => python-jsonpatch_1.11.bb} (77%)
>  rename meta-openstack/recipes-devtools/python/{python-jsonpointer_1.7.bb
> => python-jsonpointer_1.9.bb} (76%)
>  rename meta-openstack/recipes-devtools/python/{python-jsonschema_2.4.0.bb
> => python-jsonschema_2.5.1.bb} (70%)
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-keystoneclient/Remove-argparse-from-requirements.txt.patch
>  rename meta-openstack/recipes-devtools/python/{python-msgpack_0.4.5.bb
> => python-msgpack_0.4.6.bb} (74%)
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-neutronclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-novaclient/Remove-argparse-from-requirements.txt.patch
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-oslo.config/Remove-argparse-from-requirements.txt.patch
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-oslo.versionedobjects_0.1.1.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-pathlib_1.0.1.bb
>  rename meta-openstack/recipes-devtools/python/{python-pbr_0.10.8.bb =>
> python-pbr_0.11.0.bb} (73%)
>  rename meta-openstack/recipes-devtools/python/{python-pecan_0.8.3.bb =>
> python-pecan_0.9.0.bb} (80%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-repoze.lru_0.6.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-semantic-version_2.4.2.bb
>  rename meta-openstack/recipes-devtools/python/{
> python-sqlalchemy-migrate_0.9.6.bb => python-sqlalchemy-migrate_0.9.7.bb}
> (78%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-sqlparse_0.1.16.bb
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-stevedore/Remove-argparse-from-requirements.txt.patch
>  rename meta-openstack/recipes-devtools/python/{python-testtools_0.9.33.bb
> => python-testtools_1.8.0.bb} (72%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-vcversioner_2.14.0.0.bb
>  delete mode 100644
> meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch
>  rename meta-openstack/recipes-extended/libvirt/{libvirt_1.2.12.bbappend
> => libvirt_1.%.bbappend} (93%)
>
> --
> 2.5.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 19598 bytes --]