From 66ccdef9007dfaa564cfd4fbcbc41b50237771b4 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Tue, 23 May 2017 14:13:55 +0200 Subject: python: Inherit setuptools instead of distutils for several packages python-appdirs python-keystoneauth python-lesscpy python-os-client-config The setup scripts of these modules use setuptools instead of distutils, resulting in errors like this: | File "setup.py", line 5, in | from setuptools import setup | ImportError: No module named setuptools Signed-off-by: Adrian Dudau Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-appdirs_git.bb | 2 +- meta-openstack/recipes-devtools/python/python-keystoneauth1_2.18.0.bb | 2 +- meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb | 2 +- meta-openstack/recipes-devtools/python/python-os-client-config_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-appdirs_git.bb b/meta-openstack/recipes-devtools/python/python-appdirs_git.bb index 8e40f26..2482871 100644 --- a/meta-openstack/recipes-devtools/python/python-appdirs_git.bb +++ b/meta-openstack/recipes-devtools/python/python-appdirs_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/ActiveState/${SRCNAME}.git" S = "${WORKDIR}/git" -inherit distutils +inherit setuptools DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-keystoneauth1_2.18.0.bb b/meta-openstack/recipes-devtools/python/python-keystoneauth1_2.18.0.bb index 1fdf9e1..83582c5 100644 --- a/meta-openstack/recipes-devtools/python/python-keystoneauth1_2.18.0.bb +++ b/meta-openstack/recipes-devtools/python/python-keystoneauth1_2.18.0.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "075a9ca7a8877c5885fa2487699015e45260c4e6be119683effe0ad2ab S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils +inherit setuptools DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb b/meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb index 61ae935..71e0dc0 100644 --- a/meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb +++ b/meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "ccad1ad2a89ced1875c5ca4e16e5478b791d31fb187fe29f1541859318 S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils +inherit setuptools DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ diff --git a/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb b/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb index 7b55dbb..5393bb7 100644 --- a/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb +++ b/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/newton" S = "${WORKDIR}/git" -inherit distutils +inherit setuptools DEPENDS += " \ python-pbr \ -- cgit v1.2.3-54-g00ecf From 3bd48fe64c0459bb09d2b17c6606e020896ebeb5 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Thu, 29 Jun 2017 13:56:39 -0400 Subject: python: satisfy setup.py 'setup_requires' for vcversioner python-jsonschema has a 'setup_requires' for python vcversioner so we must have a -native version of python-vcversioner and DEPEND on it in order to avoid setup.py downloading the requires from PyPI. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb | 5 +++++ .../recipes-devtools/python/python-vcversioner_2.14.0.0.bb | 8 ++++++++ 2 files changed, 13 insertions(+) (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb b/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb index a3a7ec0..fef8d5f 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonschema_2.5.1.bb @@ -17,3 +17,8 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools DEPENDS += "python-vcversioner" + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-vcversioner-native \ + " 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 index 2fe96ab..bcff6f3 100644 --- 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 @@ -14,3 +14,11 @@ SRC_URI[sha256sum] = "acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357 S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools + + +DEPENDS_class-native += " \ + python \ + python-setuptools \ + " + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf From 487a535eb568ed9e71da20ad73b8c08892660163 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Jun 2017 16:52:47 +0800 Subject: python-pyparsing: Move from meta-openstack to meta-cloud-services It's not an openstack specific package. Signed-off-by: He Zhe Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-pyparsing_2.0.1.bb | 17 ----------------- recipes-devtools/python/python-pyparsing_2.0.1.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb create mode 100644 recipes-devtools/python/python-pyparsing_2.0.1.bb (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb b/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb deleted file mode 100644 index 32d9ebb..0000000 --- a/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Python parsing module" -HOMEPAGE = "http://pyparsing.wikispaces.com/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb46329938e6bc829b256e37d5c1e31a" - -PR = "r0" -SRCNAME = "pyparsing" - -SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.zip" - -SRC_URI[md5sum] = "dc7036a6f1ab01c3baed3d97af8d77c0" -SRC_URI[sha256sum] = "7e1766ee747cca79fe172b670fd53ef58fc55d2b1804fd6c66d857abb62d143a" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils diff --git a/recipes-devtools/python/python-pyparsing_2.0.1.bb b/recipes-devtools/python/python-pyparsing_2.0.1.bb new file mode 100644 index 0000000..32d9ebb --- /dev/null +++ b/recipes-devtools/python/python-pyparsing_2.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Python parsing module" +HOMEPAGE = "http://pyparsing.wikispaces.com/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fb46329938e6bc829b256e37d5c1e31a" + +PR = "r0" +SRCNAME = "pyparsing" + +SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.zip" + +SRC_URI[md5sum] = "dc7036a6f1ab01c3baed3d97af8d77c0" +SRC_URI[sha256sum] = "7e1766ee747cca79fe172b670fd53ef58fc55d2b1804fd6c66d857abb62d143a" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils -- cgit v1.2.3-54-g00ecf