aboutsummaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2018-04-22 11:50:28 -0400
committerArmin Kuster <akuster808@gmail.com>2018-05-01 18:17:02 -0700
commit213c47118c571dfbd3bf5749341bd944d884c7c9 (patch)
tree429e442b759ccf41c2cf6b1c9169871815450c96 /meta-python
parenta06afb02d288d33a9b52625a82cc2fc47dc63e8a (diff)
downloadmeta-openembedded-contrib-213c47118c571dfbd3bf5749341bd944d884c7c9.tar.gz
meta-openembedded-contrib-213c47118c571dfbd3bf5749341bd944d884c7c9.tar.bz2
meta-openembedded-contrib-213c47118c571dfbd3bf5749341bd944d884c7c9.zip
python-jsonpatch: update to version 1.23
Remove upstreamed patch Drop-support-for-EOL-Python-3.3.patch Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python-jsonpatch.inc4
-rw-r--r--meta-python/recipes-devtools/python/python-jsonpatch/Drop-support-for-EOL-Python-3.3.patch35
-rw-r--r--meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb (renamed from meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb)4
-rw-r--r--meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb (renamed from meta-python/recipes-devtools/python/python3-jsonpatch_1.21.bb)0
4 files changed, 2 insertions, 41 deletions
diff --git a/meta-python/recipes-devtools/python/python-jsonpatch.inc b/meta-python/recipes-devtools/python/python-jsonpatch.inc
index e559fb1ebe..409c09ad77 100644
--- a/meta-python/recipes-devtools/python/python-jsonpatch.inc
+++ b/meta-python/recipes-devtools/python/python-jsonpatch.inc
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3"
inherit pypi
-SRC_URI[md5sum] = "0b20d819daf120ed3fef3be608f2ce18"
-SRC_URI[sha256sum] = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153"
+SRC_URI[md5sum] = "83c4c9faccb4a2ff8c1db80cbddc590d"
+SRC_URI[sha256sum] = "49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9"
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
deleted file mode 100644
index ccd8e127c9..0000000000
--- a/meta-python/recipes-devtools/python/python-jsonpatch/Drop-support-for-EOL-Python-3.3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-
diff --git a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb b/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb
index 2b253b50ea..90cd318026 100644
--- a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb
+++ b/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb
@@ -2,7 +2,3 @@ inherit setuptools
require python-jsonpatch.inc
RDEPENDS_${PN} += "${PYTHON_PN}-re"
-
-SRC_URI += " \
- file://Drop-support-for-EOL-Python-3.3.patch \
-"
diff --git a/meta-python/recipes-devtools/python/python3-jsonpatch_1.21.bb b/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb
index 73efceeed3..73efceeed3 100644
--- a/meta-python/recipes-devtools/python/python3-jsonpatch_1.21.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb