summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-devtools/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"
5 5
6inherit pypi 6inherit pypi
7 7
8SRC_URI[md5sum] = "0b20d819daf120ed3fef3be608f2ce18" 8SRC_URI[md5sum] = "83c4c9faccb4a2ff8c1db80cbddc590d"
9SRC_URI[sha256sum] = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153" 9SRC_URI[sha256sum] = "49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9"
10 10
11RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold" 11RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold"
12 12
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 @@
1From 71bdeed8b49390ff14fe8f0434fc8a1038d89128 Mon Sep 17 00:00:00 2001
2From: Hugo <hugovk@users.noreply.github.com>
3Date: Tue, 16 Jan 2018 14:22:33 +0200
4Subject: [PATCH 1/4] Drop support for EOL Python 3.3
5
6Upstream-Status: Backport
7
8[MA: remove dev only files from patch]
9Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
10
11---
12 setup.py | 2 +-
13
14diff --git a/setup.py b/setup.py
15index 0776c41..471c433 100644
16--- a/setup.py
17+++ b/setup.py
18@@ -58,7 +58,6 @@ CLASSIFIERS = [
19 'Programming Language :: Python :: 2',
20 'Programming Language :: Python :: 2.7',
21 'Programming Language :: Python :: 3',
22- 'Programming Language :: Python :: 3.3',
23 'Programming Language :: Python :: 3.4',
24 'Programming Language :: Python :: 3.5',
25 'Programming Language :: Python :: 3.6',
26@@ -81,5 +80,6 @@ setup(name=PACKAGE,
27 package_data={'': ['requirements.txt']},
28 scripts=['bin/jsondiff', 'bin/jsonpatch'],
29 classifiers=CLASSIFIERS,
30+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
31 **OPTIONS
32 )
33--
342.7.4
35
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
2require python-jsonpatch.inc 2require python-jsonpatch.inc
3 3
4RDEPENDS_${PN} += "${PYTHON_PN}-re" 4RDEPENDS_${PN} += "${PYTHON_PN}-re"
5
6SRC_URI += " \
7 file://Drop-support-for-EOL-Python-3.3.patch \
8"
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