| Message ID | 20240327071636.2207445-2-mingli.yu@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-python,kirkstone,1/3] python3-pyyaml-include: add initial recipe for version 1.3.2 | expand |
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,
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,
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?
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] > -=-=-=-=-=-=-=-=-=-=-=- >
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] > -=-=-=-=-=-=-=-=-=-=-=- >
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 \ "