From 7be9b023d6d0fed63bede6141320da1d84e42bd8 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 16 Aug 2022 12:36:57 +0300 Subject: [PATCH] bigclown-control-tool: use Python's json lib From: https://github.com/hardwario/bch-control-tool/pull/5 This is a backport version 0.2.0 Signed-off-by: Alexandru Ardelean --- utils/bigclown/bigclown-control-tool/Makefile | 5 +- ...h-use-Python-s-built-in-json-library.patch | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 utils/bigclown/bigclown-control-tool/patches/0001-bch-use-Python-s-built-in-json-library.patch diff --git a/utils/bigclown/bigclown-control-tool/Makefile b/utils/bigclown/bigclown-control-tool/Makefile index 6e8db708b07c6c..84958d4a87d36c 100644 --- a/utils/bigclown/bigclown-control-tool/Makefile +++ b/utils/bigclown/bigclown-control-tool/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-control-tool PKG_VERSION:=0.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PYPI_NAME:=bch PKG_HASH:=4cd73b92757fce7275a4744baed411c867af2e671c521b90d6690b2320851d58 @@ -30,8 +30,7 @@ define Package/bigclown-control-tool +python3-click-log \ +python3-paho-mqtt \ +python3-pyserial \ - +python3-yaml \ - +python3-simplejson + +python3-yaml endef $(eval $(call Py3Package,bigclown-control-tool)) diff --git a/utils/bigclown/bigclown-control-tool/patches/0001-bch-use-Python-s-built-in-json-library.patch b/utils/bigclown/bigclown-control-tool/patches/0001-bch-use-Python-s-built-in-json-library.patch new file mode 100644 index 00000000000000..6a5fd7010e0e88 --- /dev/null +++ b/utils/bigclown/bigclown-control-tool/patches/0001-bch-use-Python-s-built-in-json-library.patch @@ -0,0 +1,48 @@ +diff --git a/bch.egg-info/requires.txt b/bch.egg-info/requires.txt +index b84c685..4352f26 100644 +--- a/bch.egg-info/requires.txt ++++ b/bch.egg-info/requires.txt +@@ -3,4 +3,3 @@ click-log>=0.2.1 + paho-mqtt>=1.0 + pyserial>=3.0 + PyYAML>=3.11 +-simplejson>=3.6.0 +diff --git a/bch/cli.py b/bch/cli.py +index 83cae3e..48d8e93 100755 +--- a/bch/cli.py ++++ b/bch/cli.py +@@ -6,7 +6,7 @@ import sys + import logging + import click + import click_log +-import simplejson as json ++import json + from datetime import datetime + import paho.mqtt.client + from paho.mqtt.client import topic_matches_sub +diff --git a/bch/mqtt_client.py b/bch/mqtt_client.py +index 7ce1576..fc8fbae 100644 +--- a/bch/mqtt_client.py ++++ b/bch/mqtt_client.py +@@ -1,7 +1,7 @@ + import paho.mqtt.client + from paho.mqtt.client import topic_matches_sub + import logging +-import simplejson as json ++import json + import time + + +diff --git a/setup.py b/setup.py +index 26aefa3..9af3fbb 100644 +--- a/setup.py ++++ b/setup.py +@@ -3,7 +3,7 @@ + + from setuptools import setup, find_packages + +-requirements = ['Click>=6.0', 'click-log>=0.2.1', 'paho-mqtt>=1.0', 'pyserial>=3.0', 'PyYAML>=3.11', 'simplejson>=3.6.0'] ++requirements = ['Click>=6.0', 'click-log>=0.2.1', 'paho-mqtt>=1.0', 'pyserial>=3.0', 'PyYAML>=3.11'] + + setup( + name='bch',