Signed-off-by: Trevor Gamblin <[email protected]> --- ....toml-Remove-hard-coded-dependencies.patch | 10 ++----- .../python/python3-pylint/run-ptest | 3 ++ .../python/python3-pylint_2.17.3.bb | 30 +++++++++++++++++-- 3 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python3-pylint/run-ptest
diff --git a/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch b/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch index 55d42b101..267e4c30d 100644 --- a/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch +++ b/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch @@ -1,21 +1,15 @@ -From 843d050f1bf889b81fa8fc3e7a1350385c8348ec Mon Sep 17 00:00:00 2001 +From c5c415a240189ac6730ba95de0bb5883dfb53609 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin <[email protected]> Date: Mon, 1 May 2023 11:32:24 -0400 Subject: [PATCH] pyproject.toml: Remove hard-coded dependencies -The upstream pyproject.toml has hard-coded dependencies on specific -versions of wheel and setuptools. This breaks builds of pylint -2.17.3, so patch it to remove the pinned versions. - -Upstream-Status: Pending - Signed-off-by: Trevor Gamblin <[email protected]> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index e4b63c660..0ee21e0eb 100644 +index bd542646b..2c0ed9485 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ diff --git a/meta-python/recipes-devtools/python/python3-pylint/run-ptest b/meta-python/recipes-devtools/python/python3-pylint/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pylint/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-pylint_2.17.3.bb b/meta-python/recipes-devtools/python/python3-pylint_2.17.3.bb index b85f77503..58f0616fc 100644 --- a/meta-python/recipes-devtools/python/python3-pylint_2.17.3.bb +++ b/meta-python/recipes-devtools/python/python3-pylint_2.17.3.bb @@ -3,10 +3,14 @@ HOMEPAGE= "http://www.pylint.org/"; LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" -SRC_URI += "file://0001-pyproject.toml-Remove-hard-coded-dependencies.patch" -SRC_URI[sha256sum] = "761907349e699f8afdcd56c4fe02f3021ab5b3a0fc26d19a9bfdc66c7d0d5cd5" +SRC_URI += " \ + git://github.com/pylint-dev/pylint;branch=main;protocol=https \ + file://run-ptest \ + file://0001-pyproject.toml-Remove-hard-coded-dependencies.patch \ + " +SRCREV ?= "389e14c36819cb87190fd412d3f366a3283f0078" -inherit pypi python_setuptools_build_meta +inherit python_setuptools_build_meta ptest RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ ${PYTHON_PN}-isort \ @@ -17,3 +21,23 @@ RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ ${PYTHON_PN}-difflib \ ${PYTHON_PN}-netserver \ " + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-dill \ + ${PYTHON_PN}-git \ + ${PYTHON_PN}-platformdirs \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest-benchmark \ + ${PYTHON_PN}-statistics \ + ${PYTHON_PN}-tomlkit \ + ${PYTHON_PN}-tomllib \ + " + +S = "${WORKDIR}/git" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript +} -- 2.40.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102270): https://lists.openembedded.org/g/openembedded-devel/message/102270 Mute This Topic: https://lists.openembedded.org/mt/98643295/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
