[oe] [meta-python][PATCH] python-jsonpatch: fix do_install

Mark Asselstine mark.asselstine at windriver.com
Mon Apr 2 14:48:31 UTC 2018


On Friday, March 30, 2018 4:22:28 AM EDT Martin Jansa wrote:
> Or it doesn't need to be applied for python3-jsonpatch at all and the
> SRC_URI change should be moved to python-jsonpatch_1.21.bb.
> 
> At least in my world builds I haven't seen this issue with
> python3-jsonpatch, only with python-jsonpatch.

I'll have a look at this and send out a V2. I am 50/50 on which way to go as 
both are viable solutions but in the end this issue is nothing to lose sleep 
over so I will just pick one and run with it. Sorry for the churn,

Mark

> 
> On Fri, Mar 30, 2018 at 8:06 AM, Tim Orling <ticotimo at gmail.com> wrote:
> > Something like:
> > FILESEXTRAPATHS_prepend := "${THISDIR}/python-jsonpatch:"
> > 
> > Will fix this. It can be in python-jsonpatch.inc (harmless for python2-,
> > required for python3-). DRY and KISS.
> > 
> > 
> > On Thu, Mar 29, 2018 at 3:03 PM Martin Jansa <martin.jansa at gmail.com>
> > 
> > wrote:
> >> This seems to break python3-jsonpatch which won't find this .patch file,
> >> because it's in different directory.
> >> 
> >> On Wed, Mar 28, 2018 at 10:10 PM, Mark Asselstine <
> >> 
> >> mark.asselstine at windriver.com> wrote:
> >> > The following error is seen when do_install is run
> >> > 
> >> > | UnicodeEncodeError: 'ascii' codec can't encode character u'\xf6' in
> >> > | position 16: ordinal not in range(128) ERROR: python setup.py
> >> > | install execution failed.
> >> > 
> >> > This is reported in the upstream project as part of pull request #81
> >> > https://github.com/stefankoegl/python-json-patch/pull/81
> >> > 
> >> > Since a release is not yet available with the required fix we must
> >> > apply the fix as a patch.
> >> > 
> >> > Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
> >> > ---
> >> > 
> >> >  .../recipes-devtools/python/python-jsonpatch.inc   |  4 +++
> >> >  .../Drop-support-for-EOL-Python-3.3.patch          | 35
> >> > 
> >> > ++++++++++++++++++++++
> >> > 
> >> >  2 files changed, 39 insertions(+)
> >> >  create mode 100644 meta-python/recipes-devtools/
> >> > 
> >> > python/python-jsonpatch/Drop-support-for-EOL-Python-3.3.patch
> >> > 
> >> > diff --git a/meta-python/recipes-devtools/python/python-jsonpatch.inc
> >> > b/meta-python/recipes-devtools/python/python-jsonpatch.inc
> >> > index e559fb1..85483df 100644
> >> > --- a/meta-python/recipes-devtools/python/python-jsonpatch.inc
> >> > +++ b/meta-python/recipes-devtools/python/python-jsonpatch.inc
> >> > @@ -8,5 +8,9 @@ inherit pypi
> >> > 
> >> >  SRC_URI[md5sum] = "0b20d819daf120ed3fef3be608f2ce18"
> >> >  SRC_URI[sha256sum] = "11f5ffdf543a83047a2f54ac28f8ca
> >> > 
> >> > ad7f34724cb1ea26b27547fd974f1a2153"
> >> > 
> >> > +SRC_URI += " \
> >> > +    file://Drop-support-for-EOL-Python-3.3.patch \
> >> > +"
> >> > +
> >> > 
> >> >  RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer
> >> > 
> >> > ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold"
> >> > 
> >> > diff --git a/meta-python/recipes-devtools/python/python-
> >> > jsonpatch/Drop-support-for-EOL-Python-3.3.patch b/meta-python/recipes-
> >> > devtools/python/python-jsonpatch/Drop-support-for-EOL-Python-3.3.patch
> >> > new file mode 100644
> >> > index 0000000..ccd8e12
> >> > --- /dev/null
> >> > +++ b/meta-python/recipes-devtools/python/python-
> >> > jsonpatch/Drop-support-for-EOL-Python-3.3.patch
> >> > @@ -0,0 +1,35 @@
> >> > +From 71bdeed8b49390ff14fe8f0434fc8a1038d89128 Mon Sep 17 00:00:00 2001
> >> > +From: Hugo <hugovk at users.noreply.github.com>
> >> > +Date: Tue, 16 Jan 2018 14:22:33 +0200
> >> > +Subject: [PATCH 1/4] Drop support for EOL Python 3.3
> >> > +
> >> > +Upstream-Status: Backport
> >> > +
> >> > +[MA: remove dev only files from patch]
> >> > +Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
> >> > +
> >> > +---
> >> > + setup.py      | 2 +-
> >> > +
> >> > +diff --git a/setup.py b/setup.py
> >> > +index 0776c41..471c433 100644
> >> > +--- a/setup.py
> >> > ++++ b/setup.py
> >> > +@@ -58,7 +58,6 @@ CLASSIFIERS = [
> >> > +     'Programming Language :: Python :: 2',
> >> > +     'Programming Language :: Python :: 2.7',
> >> > +     'Programming Language :: Python :: 3',
> >> > +-    'Programming Language :: Python :: 3.3',
> >> > +     'Programming Language :: Python :: 3.4',
> >> > +     'Programming Language :: Python :: 3.5',
> >> > +     'Programming Language :: Python :: 3.6',
> >> > +@@ -81,5 +80,6 @@ setup(name=PACKAGE,
> >> > +       package_data={'': ['requirements.txt']},
> >> > +       scripts=['bin/jsondiff', 'bin/jsonpatch'],
> >> > +       classifiers=CLASSIFIERS,
> >> > ++      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
> >> > +       **OPTIONS
> >> > + )
> >> > +--
> >> > +2.7.4
> >> > +
> >> > --
> >> > 2.7.4
> >> > 
> >> > --
> >> > _______________________________________________
> >> > Openembedded-devel mailing list
> >> > Openembedded-devel at lists.openembedded.org
> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >> 
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel





More information about the Openembedded-devel mailing list