From 182f31a182f6572a3538b875cec7ee761e2da1e6 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Fri, 16 Feb 2024 16:15:49 -0800 Subject: python3-pyyaml-include: switch to pytest --automake * Also replace ${PYTHON_PN} with python3 Signed-off-by: Tim Orling Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-pyyaml-include/run-ptest | 2 +- .../recipes-devtools/python/python3-pyyaml-include_1.3.2.bb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest b/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest index 3385d68939..8d2017d39c 100755 --- a/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest +++ b/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest @@ -1,3 +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/SKIPED/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}}' +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb index 9bfaa21946..3a5bd99a78 100644 --- a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Extending PyYAML with a custom constructor for including YAML files w HOMEPAGE = "https://github.com/tanbro/pyyaml-include" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" SRCREV = "36b6975aa8fc7a6cbf37de40aa2ed6d996b2f7be" SRC_URI = " \ @@ -20,9 +20,10 @@ do_install_ptest() { } RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pyyaml \ + python3-pyyaml \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " -- cgit v1.2.3-54-g00ecf