[arch-commits] Commit in python-spsdk/trunk (2 files)

[David Runge]

    Date: Monday, April 4, 2022 @ 18:19:29
  Author: dvzrv
Revision: 1181362

upgpkg: python-spsdk 1.6.3-1: Upgrade to 1.6.3.

Add patch to fix compatibility with python-click >= 8.1.

Added:
  python-spsdk/trunk/python-spsdk-1.6.3-click8.1.patch
Modified:
  python-spsdk/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   18 ++++++++++++------
 python-spsdk-1.6.3-click8.1.patch |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-04 18:05:59 UTC (rev 1181361)
+++ PKGBUILD	2022-04-04 18:19:29 UTC (rev 1181362)
@@ -2,7 +2,7 @@
 
 _name=spsdk
 pkgname=python-spsdk
-pkgver=1.6.2
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="NXP Secure Provisioning SDK"
 arch=(any)
@@ -41,15 +41,18 @@
   python-pyyaml
 )
 # pypi sdist tarball has no tests: https://github.com/NXPmicro/spsdk/issues/37
-# source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
+# source=("https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz")
 source=(
   $_name-$pkgver.tar.gz::https://github.com/NXPmicro/$_name/archive/refs/tags/$pkgver.tar.gz
   $pkgname-1.6.0-remove_pypemicro.patch
+  $pkgname-1.6.3-click8.1.patch
 )
-sha512sums=('e2592503323bd205624cbf7a5c0f19983ee219126ec7e01b58091a7556f232d3c70b3770fbaa97b5da7b7f56c4a372952d56839f291ea8fa92b4a64c9bab953c'
-            '7bfb3739053284ba0b4084c1f84e37e307233fa7b52adf403fa5c574393d71e08ea02bdc927106b036d1055f6efd6c326b534d697c1d5f6c097def53dbafc560')
-b2sums=('fe76d882b83035bf0087538c613e00b292feceb456f73cbfc7c28dcc3dae6691703c56de06163acd4093a42d51cb47046354e074b3bb360f9b5ea5a6689699fe'
-        '2c68116494b5e7ff51e59ec79dd3e354e2a8035ab35e29b27a097d7baa47e48c71a2cdac651920c76cd29097c5e8710e74106e41a4b3d5f543e259ef7404beac')
+sha512sums=('fe7b8ae82756b93ef90467617d9b3492c4d103bfcae2efbd6067208b1ea82c5e7cf599e5d56f1c25ff8850d61acf4068b04541df8763068562ff3f3438749ac3'
+            '7bfb3739053284ba0b4084c1f84e37e307233fa7b52adf403fa5c574393d71e08ea02bdc927106b036d1055f6efd6c326b534d697c1d5f6c097def53dbafc560'
+            'bbeadf90867fc26bf2bb7cb5adc41fc7acfd7a577cf989525ca084da9863baebbb46aec17c57b1e5dd767d50d0e341cdf4552b820cb12122e6c5de250f48c538')
+b2sums=('cbd58524ea291cfab21ad26c639e43058bd3e3db90ee70873919bf3a84b90e44eeb2d1fe72cd019dbb225a1fcd1118f5500ef462dc7284bc9df4e4f4995ff641'
+        '2c68116494b5e7ff51e59ec79dd3e354e2a8035ab35e29b27a097d7baa47e48c71a2cdac651920c76cd29097c5e8710e74106e41a4b3d5f543e259ef7404beac'
+        '4fda1af3ad7b1aec6b9c50ae27dacbc16e3bb57ef0f4a8d9fe0f820acf5212deb174c793805fbf45f70d6d3492650eb9bc2ecd3b9699e3aec2775e8989f25ec5')
 
 prepare() {
   cd $_name-$pkgver
@@ -66,6 +69,9 @@
   # https://github.com/NXPmicro/spsdk/issues/30
   # https://github.com/NXPmicro/pypemicro/issues/10
   sed '/pyocd-pemicro/d' -i requirements.txt
+
+  # click 8.1 removed get_os_args, so replace with sys.argv[1:]
+  patch -Np1 -i ../$pkgname-1.6.3-click8.1.patch
 }
 
 build() {

Added: python-spsdk-1.6.3-click8.1.patch
===================================================================
--- python-spsdk-1.6.3-click8.1.patch	                        (rev 0)
+++ python-spsdk-1.6.3-click8.1.patch	2022-04-04 18:19:29 UTC (rev 1181362)
@@ -0,0 +1,21 @@
+diff -ruN a/spsdk/apps/blhost.py b/spsdk/apps/blhost.py
+--- a/spsdk/apps/blhost.py	2022-04-01 14:14:28.000000000 +0200
++++ b/spsdk/apps/blhost.py	2022-04-04 20:15:23.171426171 +0200
+@@ -127,7 +127,7 @@
+ 
+     # print help for get-property if property tag is 0 or 'list-properties'
+     if ctx.invoked_subcommand == "get-property":
+-        args = click.get_os_args()
++        args = sys.argv[1:]
+         # running this via pytest changes the args to a single arg, in that case skip
+         if len(args) > 1 and "get-property" in args:
+             tag_str = args[args.index("get-property") + 1]
+@@ -136,7 +136,7 @@
+                 ctx.exit(0)
+ 
+     # if --help is provided anywhere on commandline, skip interface lookup and display help message
+-    if "--help" not in click.get_os_args():
++    if "--help" not in sys.argv[1:]:
+         ctx.obj = {
+             "interface": get_interface(
+                 module="mboot", port=port, usb=usb, timeout=timeout, lpcusbsio=lpcusbsio