[meta-python][kirkstone][PATCH 1/3] python3-pyyaml-include: add initial recipe for version 1.3.2

[meta-python][kirkstone][PATCH 1/3] python3-pyyaml-include: add initial recipe for version 1.3.2

[mingli.yu]

From: Derek Straka <derek@asterius.io>

Add a recipe for the pyyaml-include package that extends PyYAML to include
YAML files within YAML files.  Add a ptest to run the unit tests and include
the tests as part of the package lists in meta-python

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit bf011a9f5e89186b338b6a335d10ef84929be0ce)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../python/python3-pyyaml-include/run-ptest   |  3 ++
 .../python/python3-pyyaml-include_1.3.2.bb    | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100755 meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest
 create mode 100644 meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb

diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest b/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest
new file mode 100755
index 000000000..3385d6893
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyyaml-include/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/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}}'
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
new file mode 100644
index 000000000..9bfaa2194
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Extending PyYAML with a custom constructor for including YAML files within YAML files"
+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"
+SRCREV = "36b6975aa8fc7a6cbf37de40aa2ed6d996b2f7be"
+
+SRC_URI = " \
+            git://github.com/tanbro/pyyaml-include;protocol=https;branch=main \
+            file://run-ptest \
+          "
+
+S = "${WORKDIR}/git"
+
+inherit python_setuptools_build_meta ptest
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+
+RDEPENDS:${PN} += " \
+    ${PYTHON_PN}-pyyaml \
+"
+RDEPENDS:${PN}-ptest += " \
+    ${PYTHON_PN}-pytest \
+"
+
-- 
2.25.1

[meta-python][kirkstone][PATCH 2/3] python3-pyyaml-include: switch to pytest --automake

[mingli.yu]

From: Tim Orling <ticotimo@gmail.com>

* Also replace ${PYTHON_PN} with python3

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 182f31a182f6572a3538b875cec7ee761e2da1e6)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../python/python3-pyyaml-include/run-ptest                | 2 +-
 .../python/python3-pyyaml-include_1.3.2.bb                 | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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 3385d6893..8d2017d39 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 9bfaa2194..3a5bd99a7 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 \
 "
 
-- 
2.25.1

Re: [oe] [meta-python][kirkstone][PATCH 2/3] python3-pyyaml-include: switch to pytest --automake

[Martin Jansa]

On Wed, Mar 27, 2024 at 8:16 AM Yu, Mingli <mingli.yu@eng.windriver.com> wrote:
>
> From: Tim Orling <ticotimo@gmail.com>
>
> * Also replace ${PYTHON_PN} with python3
>
> Signed-off-by: Tim Orling <tim.orling@konsulko.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> (cherry picked from commit 182f31a182f6572a3538b875cec7ee761e2da1e6)
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
...
> 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 9bfaa2194..3a5bd99a7 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 \
>  "

This was now merged to meta-oe kirkstone, but the
python3-unittest-automake-output isn't available in oe-core kirkstone,
causing:
ERROR: Nothing RPROVIDES 'python3-unittest-automake-output' (but
meta-oe/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
RDEPENDS on or otherwise requires it)

python3-unittest-automake-output was added to oe-core in mickledore:

openembedded-core $ git log --oneline --
./meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb
db0e82135c python3-unittest-automake-output: upgrade to 0.2
961e4f3fc7 python3-unittest-automake-output: add new recipe for ptest
integration

Please revert this (if the newer python3-pyyaml-include works without
this change) or add python3-unittest-automake-output to kirkstone as
well.

Cheers,

Re: [oe] [meta-python][kirkstone][PATCH 2/3] python3-pyyaml-include: switch to pytest --automake

[Yu, Mingli]

On 4/30/24 15:16, Martin Jansa wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
> 
> On Wed, Mar 27, 2024 at 8:16 AM Yu, Mingli <mingli.yu@eng.windriver.com> wrote:
>>
>> From: Tim Orling <ticotimo@gmail.com>
>>
>> * Also replace ${PYTHON_PN} with python3
>>
>> Signed-off-by: Tim Orling <tim.orling@konsulko.com>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> (cherry picked from commit 182f31a182f6572a3538b875cec7ee761e2da1e6)
>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ...
>> 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 9bfaa2194..3a5bd99a7 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 \
>>   "
> 
> This was now merged to meta-oe kirkstone, but the
> python3-unittest-automake-output isn't available in oe-core kirkstone,
> causing:
> ERROR: Nothing RPROVIDES 'python3-unittest-automake-output' (but
> meta-oe/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
> RDEPENDS on or otherwise requires it)
> 
> python3-unittest-automake-output was added to oe-core in mickledore:
> 
> openembedded-core $ git log --oneline --
> ./meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb
> db0e82135c python3-unittest-automake-output: upgrade to 0.2
> 961e4f3fc7 python3-unittest-automake-output: add new recipe for ptest
> integration
> 
> Please revert this (if the newer python3-pyyaml-include works without
> this change) or add python3-unittest-automake-output to kirkstone as
> well.

The python3-pyyaml-include did works without 
python3-unittest-automake-output, but the python3-pyyaml-include ptest 
needs python3-unittest-automake-output and I also sent the patch to 
oe-core(kirkstone)[1].

[1] 
https://lore.kernel.org/all/20240327072236.2221619-1-mingli.yu@windriver.com/T/#mda91919809cf156aba24f099bef65142067cd318

Thanks,

> 
> Cheers,

Re: [oe] [meta-python][kirkstone][PATCH 2/3] python3-pyyaml-include: switch to pytest --automake

[Martin Jansa]

On Tue, Apr 30, 2024 at 9:28 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
>
>
>
> On 4/30/24 15:16, Martin Jansa wrote:
> > CAUTION: This email comes from a non Wind River email account!
> > Do not click links or open attachments unless you recognize the sender and know the content is safe.
> >
> > On Wed, Mar 27, 2024 at 8:16 AM Yu, Mingli <mingli.yu@eng.windriver.com> wrote:
> >>
> >> From: Tim Orling <ticotimo@gmail.com>
> >>
> >> * Also replace ${PYTHON_PN} with python3
> >>
> >> Signed-off-by: Tim Orling <tim.orling@konsulko.com>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> (cherry picked from commit 182f31a182f6572a3538b875cec7ee761e2da1e6)
> >> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> > ...
> >> 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 9bfaa2194..3a5bd99a7 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 \
> >>   "
> >
> > This was now merged to meta-oe kirkstone, but the
> > python3-unittest-automake-output isn't available in oe-core kirkstone,
> > causing:
> > ERROR: Nothing RPROVIDES 'python3-unittest-automake-output' (but
> > meta-oe/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
> > RDEPENDS on or otherwise requires it)
> >
> > python3-unittest-automake-output was added to oe-core in mickledore:
> >
> > openembedded-core $ git log --oneline --
> > ./meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb
> > db0e82135c python3-unittest-automake-output: upgrade to 0.2
> > 961e4f3fc7 python3-unittest-automake-output: add new recipe for ptest
> > integration
> >
> > Please revert this (if the newer python3-pyyaml-include works without
> > this change) or add python3-unittest-automake-output to kirkstone as
> > well.
>
> The python3-pyyaml-include did works without
> python3-unittest-automake-output, but the python3-pyyaml-include ptest
> needs python3-unittest-automake-output and I also sent the patch to
> oe-core(kirkstone)[1].
>
> [1]
> https://lore.kernel.org/all/20240327072236.2221619-1-mingli.yu@windriver.com/T/#mda91919809cf156aba24f099bef65142067cd318

[1] was rejected by Steve, so what's the plan now?

Re: [oe] [meta-python][kirkstone][PATCH 2/3] python3-pyyaml-include: switch to pytest --automake

[Yu, Mingli]

On 4/30/24 15:45, Martin Jansa wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
> 
> On Tue, Apr 30, 2024 at 9:28 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
>>
>>
>>
>> On 4/30/24 15:16, Martin Jansa wrote:
>>> CAUTION: This email comes from a non Wind River email account!
>>> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>>>
>>> On Wed, Mar 27, 2024 at 8:16 AM Yu, Mingli <mingli.yu@eng.windriver.com> wrote:
>>>>
>>>> From: Tim Orling <ticotimo@gmail.com>
>>>>
>>>> * Also replace ${PYTHON_PN} with python3
>>>>
>>>> Signed-off-by: Tim Orling <tim.orling@konsulko.com>
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>> (cherry picked from commit 182f31a182f6572a3538b875cec7ee761e2da1e6)
>>>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>>> ...
>>>> 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 9bfaa2194..3a5bd99a7 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 \
>>>>    "
>>>
>>> This was now merged to meta-oe kirkstone, but the
>>> python3-unittest-automake-output isn't available in oe-core kirkstone,
>>> causing:
>>> ERROR: Nothing RPROVIDES 'python3-unittest-automake-output' (but
>>> meta-oe/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
>>> RDEPENDS on or otherwise requires it)
>>>
>>> python3-unittest-automake-output was added to oe-core in mickledore:
>>>
>>> openembedded-core $ git log --oneline --
>>> ./meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb
>>> db0e82135c python3-unittest-automake-output: upgrade to 0.2
>>> 961e4f3fc7 python3-unittest-automake-output: add new recipe for ptest
>>> integration
>>>
>>> Please revert this (if the newer python3-pyyaml-include works without
>>> this change) or add python3-unittest-automake-output to kirkstone as
>>> well.
>>
>> The python3-pyyaml-include did works without
>> python3-unittest-automake-output, but the python3-pyyaml-include ptest
>> needs python3-unittest-automake-output and I also sent the patch to
>> oe-core(kirkstone)[1].
>>
>> [1]
>> https://lore.kernel.org/all/20240327072236.2221619-1-mingli.yu@windriver.com/T/#mda91919809cf156aba24f099bef65142067cd318
> 
> [1] was rejected by Steve, so what's the plan now?

Is it okay to add python3-unittest-automake-output in 
meta-openembedded/meta-python(kirkstone)? If okay, I will send the patch 
then.

Thanks,

> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110193): https://lists.openembedded.org/g/openembedded-devel/message/110193
> Mute This Topic: https://lists.openembedded.org/mt/105173183/3618448
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [mingli.yu@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

[meta-python][kirkstone][PATCH] python3-pyyaml-include: Drop pytest --automake

[mingli.yu]

From: Mingli Yu <mingli.yu@windriver.com>

The python3-unittest-automake-output is not supported [1], so drop
"pytest --automake".

[1] https://lore.kernel.org/all/20240327072236.2221619-1-mingli.yu@windriver.com/T/#mda91919809cf156aba24f099bef65142067cd318

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../recipes-devtools/python/python3-pyyaml-include/run-ptest    | 2 +-
 .../recipes-devtools/python/python3-pyyaml-include_1.4.1.bb     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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 8d2017d39..3385d6893 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 --automake
+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}}'
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
index 6768e959f..b60a0f9c8 100644
--- a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
@@ -24,6 +24,5 @@ RDEPENDS:${PN} += " \
 "
 RDEPENDS:${PN}-ptest += " \
     python3-pytest \
-    python3-unittest-automake-output \
 "
 
-- 
2.25.1

Re: [oe] [meta-python][kirkstone][PATCH] python3-pyyaml-include: Drop pytest --automake

[Yu, Mingli]

Ping.

Thanks,

On 4/30/24 16:53, Yu, Mingli wrote:
> From: Mingli Yu <mingli.yu@windriver.com>
> 
> The python3-unittest-automake-output is not supported [1], so drop
> "pytest --automake".
> 
> [1] https://lore.kernel.org/all/20240327072236.2221619-1-mingli.yu@windriver.com/T/#mda91919809cf156aba24f099bef65142067cd318
> 
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>   .../recipes-devtools/python/python3-pyyaml-include/run-ptest    | 2 +-
>   .../recipes-devtools/python/python3-pyyaml-include_1.4.1.bb     | 1 -
>   2 files changed, 1 insertion(+), 2 deletions(-)
> 
> 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 8d2017d39..3385d6893 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 --automake
> +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}}'
> diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
> index 6768e959f..b60a0f9c8 100644
> --- a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
> +++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
> @@ -24,6 +24,5 @@ RDEPENDS:${PN} += " \
>   "
>   RDEPENDS:${PN}-ptest += " \
>       python3-pytest \
> -    python3-unittest-automake-output \
>   "
>   
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110196): https://lists.openembedded.org/g/openembedded-devel/message/110196
> Mute This Topic: https://lists.openembedded.org/mt/105817400/3618448
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [mingli.yu@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

[meta-python][kirkstone][PATCH 3/3] python3-pyyaml-include: Upgrade 1.3.2 -> 1.4.1

[mingli.yu]

From: Mingli Yu <mingli.yu@windriver.com>

* Upgrade to 1.4.1 to make it work with setuptools 59.x as it doesn't
support pep 621 [1], so remove pyproject.toml and add setup.cfg back [2].

* Add python3-toml to RDEPENDS to fix below error:
 self = <yamlinclude.readers.TomlReader object at 0x7faceccdbd30>

     def __call__(self):
         if sys.version_info >= (3, 11):
             with open(self._path, "rb") as fp:
                 return tomllib.load(fp)
         else:
             try:
                 import toml
             except ImportError as err:  # pragma: no cover
 >               raise ImportError(f'Un-supported file "{self._path}".\n`pip install toml` should solve the problem.\n\n{err}')
 E               ImportError: Un-supported file "tests/data/include.d/1.toml".
 E               `pip install toml` should solve the problem.
 E
 E               No module named 'toml'

 ../../python3.10/site-packages/yamlinclude/readers.py:69: ImportError

[1] https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html
[2] https://github.com/tanbro/pyyaml-include/issues/43

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 ...aml-include_1.3.2.bb => python3-pyyaml-include_1.4.1.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-pyyaml-include_1.3.2.bb => python3-pyyaml-include_1.4.1.bb} (86%)

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.4.1.bb
similarity index 86%
rename from meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb
rename to meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
index 3a5bd99a7..6768e959f 100644
--- a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb
+++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb
@@ -2,11 +2,10 @@ 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 += "python3-setuptools-scm-native"
-SRCREV = "36b6975aa8fc7a6cbf37de40aa2ed6d996b2f7be"
+SRCREV = "0f86bf16343d2ad52b53b793e0b35bb7ed7cd85b"
 
 SRC_URI = " \
-            git://github.com/tanbro/pyyaml-include;protocol=https;branch=main \
+            git://github.com/tanbro/pyyaml-include;protocol=https;branch=1.x \
             file://run-ptest \
           "
 
@@ -21,6 +20,7 @@ do_install_ptest() {
 
 RDEPENDS:${PN} += " \
     python3-pyyaml \
+    python3-toml \
 "
 RDEPENDS:${PN}-ptest += " \
     python3-pytest \
-- 
2.25.1