On Wed, May 31, 2017 at 1:14 PM, M. Asselstine <[email protected]> wrote:
> On Tue, May 23, 2017 at 8:13 AM, Adrian Dudau <[email protected]> > wrote: > > 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 <module> > > | from setuptools import setup > > | ImportError: No module named setuptools > > > > Signed-off-by: Adrian Dudau <[email protected]> > > > Agreed. The setup.py for all of these packages have some form of > 'import setuptools' so this is the correct change. I mentioned to > Bruce I would have a look at these as I know in the past we have had > some flip-flopping in this regard. Anyways, Bruce this change is fine > and at least in my mind OK to merge. > Thanks for the review, I was looking for another opinion! This is now merged. Bruce > > Mark > > > --- > > 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(-) > > > > 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] = "075a9ca7a8877c5885fa2487699015 > e45260c4e6be119683effe0ad2ab > > > > 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] = "ccad1ad2a89ced1875c5ca4e16e547 > 8b791d31fb187fe29f1541859318 > > > > 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 \ > > -- > > 2.7.4 > > > > -- > > _______________________________________________ > > meta-virtualization mailing list > > [email protected] > > https://lists.yoctoproject.org/listinfo/meta-virtualization > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
