From: Alexandru Ardelean Date: Sun, 7 Jun 2026 11:37:59 +0000 (+0300) Subject: python-jmespath: install jp as a non-byte-compiled command X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e7aff35e97b5587b37ea2b6b68caa9cc052eb42d;p=openwrt-packages.git python-jmespath: install jp as a non-byte-compiled command Upstream ships its jp command-line tool as a plain "jp.py" script. Under that name OpenWrt byte-compiles it into a non-executable /usr/bin/jp.pyc (and the -src package keeps a "#!/usr/bin/env python" jp.py, which has no interpreter on OpenWrt), so it fails the CI generic executable check. Install it as /usr/bin/jp instead: the missing .py extension stops it from being byte-compiled and Python3/FixShebang rewrites the shebang to /usr/bin/python3. Add a test-version.sh override since jp takes a required expression argument and has no version flag for the generic check to probe. Signed-off-by: Alexandru Ardelean --- diff --git a/lang/python/python-jmespath/Makefile b/lang/python/python-jmespath/Makefile index 81fb9e11a..59a5e15d6 100644 --- a/lang/python/python-jmespath/Makefile +++ b/lang/python/python-jmespath/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-jmespath PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=jmespath PKG_HASH:=472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d @@ -29,6 +29,11 @@ JMESPath (pronounced “james path”) allows you to declaratively specify how to extract elements from a JSON document. endef +define Py3Package/python3-jmespath/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jp.py $(1)/usr/bin/jp +endef + $(eval $(call Py3Package,python3-jmespath)) $(eval $(call BuildPackage,python3-jmespath)) $(eval $(call BuildPackage,python3-jmespath-src)) diff --git a/lang/python/python-jmespath/test-version.sh b/lang/python/python-jmespath/test-version.sh new file mode 100644 index 000000000..a71961a7d --- /dev/null +++ b/lang/python/python-jmespath/test-version.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# shellcheck shell=busybox + +# The jp command-line tool takes a required expression argument and has no +# version flag, so the generic version check cannot detect the version from it. +# The version is covered by the import check in test.sh instead. +case "$PKG_NAME" in +python3-jmespath | python3-jmespath-src) + exit 0 + ;; +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac diff --git a/lang/python/python-jmespath/test.sh b/lang/python/python-jmespath/test.sh index 128cd0bbb..56346bacc 100755 --- a/lang/python/python-jmespath/test.sh +++ b/lang/python/python-jmespath/test.sh @@ -37,3 +37,11 @@ assert expr.search({"a": {"b": 99}}) == 99 sys.exit(0) EOF +[ $? -eq 0 ] || exit 1 + +# Verify the jp command-line tool +result=$(echo '{"a": {"b": 42}}' | jp 'a.b') +[ "$result" = "42" ] || { + echo "jp returned '$result', expected 42" + exit 1 +}