forked from openembedded/meta-openembedded
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 openembedded#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. Signed-off-by: Mark Asselstine <[email protected]> Signed-off-by: Armin Kuster <[email protected]>
- Loading branch information
1 parent
3ab6741
commit 3aa3c37
Showing
2 changed files
with
39 additions
and
0 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
meta-python/recipes-devtools/python/python-jsonpatch/Drop-support-for-EOL-Python-3.3.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]> | ||
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 <[email protected]> | ||
|
||
--- | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters