From 80b3f2e8203b26d8424d2e86405293a1fc0e262b Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 4 Dec 2017 14:00:44 -0500 Subject: python-pyroute2: uprev to v0.4.21 (from 0.3.22) Drop the json<-->simplejson patch instead opting to depend on python-json (part of core python libs). Beyond this the uprev is straightforward. Signed-off-by: Mark Asselstine Signed-off-by: Armin Kuster --- .../import-simplejson-as-json.patch | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch (limited to 'meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch') diff --git a/meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch b/meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch deleted file mode 100644 index d73da07d25..0000000000 --- a/meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Inappropriate [wrong dependency] - -Subject: [PATCH] import simplejson as json - -At runtime python-pyroute2 tries to import json, but the module is not -available, import simplejson as json solve the issue. - -Signed-off-by: Fabio Berton ---- - pyroute2/netlink/rtnl/ifinfmsg.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyroute2/netlink/rtnl/ifinfmsg.py b/pyroute2/netlink/rtnl/ifinfmsg.py -index 4f14f25..55643eb 100644 ---- a/pyroute2/netlink/rtnl/ifinfmsg.py -+++ b/pyroute2/netlink/rtnl/ifinfmsg.py -@@ -1,5 +1,5 @@ - import os --import json -+import simplejson as json - import errno - import select - import struct --- -2.1.4 - -- cgit v1.2.3-54-g00ecf