Skip to content

Commit

Permalink
python-jsonpatch: fix do_install failure with py2 build
Browse files Browse the repository at this point in the history
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
stefankoegl/python-json-patch#81

Since a release is not yet available with the required fix we must
apply the fix as a patch.

(From meta-openembedded commit: 3aa3c374ca7cd0850bdede6a404936737abb4068)

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>
  • Loading branch information
masselstine authored and akuster committed Apr 9, 2018
1 parent 9516a1b commit 6a5f343
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 71bdeed8b49390ff14fe8f0434fc8a1038d89128 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@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@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

4 changes: 4 additions & 0 deletions recipes-devtools/python/python-jsonpatch_1.21.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
"

0 comments on commit 6a5f343

Please sign in to comment.