[oe-commits] [meta-openembedded] 72/91: python-jsonpatch: fix do_install failure with py2 build

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.

commit 2148762ef6e48d9c360712f79dfe6008705f5d59
Author: Mark Asselstine <mark.asselstine at windriver.com>
AuthorDate: Mon Apr 2 11:03:43 2018 -0400

    python-jsonpatch: fix do_install failure with py2 build
    
    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>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../Drop-support-for-EOL-Python-3.3.patch          | 35 ++++++++++++++++++++++
 .../python/python-jsonpatch_1.21.bb                |  4 +++
 2 files changed, 39 insertions(+)

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
+
diff --git a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb b/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb
index 90cd318..2b253b5 100644
--- a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb
+++ b/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb
@@ -2,3 +2,7 @@ inherit setuptools
 require python-jsonpatch.inc
 
 RDEPENDS_${PN} += "${PYTHON_PN}-re"
+
+SRC_URI += " \
+    file://Drop-support-for-EOL-Python-3.3.patch \
+"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.