From 0a89c5fa0d68d4c0325ca0790990ba4c5df592eb Mon Sep 17 00:00:00 2001 From: Josep Puigdemont Date: Wed, 9 Dec 2015 13:40:19 +0100 Subject: Use a bbclass to remove argparse from requirements 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 "", line 1, in 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 Signed-off-by: Bruce Ashfield --- meta-openstack/classes/rmargparse.bbclass | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-openstack/classes/rmargparse.bbclass (limited to 'meta-openstack/classes') 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 +} -- cgit v1.2.3-54-g00ecf