diff mbox series

[meta-python,scarthgap,1/2] python3-twisted: remove obsolete python3-twisted-flow

Message ID 20240506185443.3715-1-gudnimar@noxmedical.com
State New
Headers show
Series [meta-python,scarthgap,1/2] python3-twisted: remove obsolete python3-twisted-flow | expand

Commit Message

Guðni Már Gilbert May 6, 2024, 6:54 p.m. UTC
The flow module was removed in Twisted 9.0.0 a long time
and currently does not install anything. Let's remove it
to cleanup the recipe.

This commit also removes python3-twisted-news package because
the source files were removed in Twisted 21.2.0. All other
files which no longer exist in the source are also removed from FILES.

Signed-off-by: Guðni Már Gilbert <gudnimar@noxmedical.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../python/python3-twisted_24.3.0.bb           | 18 ------------------
 1 file changed, 18 deletions(-)

Comments

Mark Hatle May 14, 2024, 3:36 p.m. UTC | #1
I see this change made it into meta-openembedded master.  But hasn't been pushed 
to scarthgap yet.

I've having a problem with this recipe in scarthgap, and so far it looks like 
these two changes do fix the problem I'm having.

The two commits I cherry-picked back to scarthgap and tested are:

bd1b5cde348dbc20e3d332de69617a8a95fe5ff3 - python3-twisted: prepend split PACKAGES

3fd6f0feec002c85df23b37c04d745a43674ee66 - python3-twisted: remove obsolete 
python3-twisted-flow

This resolves the issue I was having.

--Mark

On 5/6/24 1:54 PM, Guðni Már Gilbert wrote:
> The flow module was removed in Twisted 9.0.0 a long time
> and currently does not install anything. Let's remove it
> to cleanup the recipe.
> 
> This commit also removes python3-twisted-news package because
> the source files were removed in Twisted 21.2.0. All other
> files which no longer exist in the source are also removed from FILES.
> 
> Signed-off-by: Guðni Már Gilbert <gudnimar@noxmedical.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../python/python3-twisted_24.3.0.bb | 18 ------------------
> 1 file changed, 18 deletions(-)
> 
> diff --git a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb 
> b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
> index e5223ccd6..ba5bb04db 100644
> --- a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
> @@ -22,11 +22,9 @@ PACKAGES += "\
> ${PN}-conch \
> ${PN}-mail \
> ${PN}-names \
> - ${PN}-news \
> ${PN}-runner \
> ${PN}-web \
> ${PN}-words \
> - ${PN}-flow \
> ${PN}-pair \
> ${PN}-core \
> "
> @@ -66,11 +64,9 @@ RDEPENDS:${PN}-test = "${PN} python3-pyhamcrest"
> RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols python3-bcrypt 
> python3-cryptography python3-pickle"
> RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols"
> RDEPENDS:${PN}-names = "${PN}-core"
> -RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols"
> RDEPENDS:${PN}-runner = "${PN}-core ${PN}-protocols"
> RDEPENDS:${PN}-web += "${PN}-core ${PN}-protocols"
> RDEPENDS:${PN}-words += "${PN}-core"
> -RDEPENDS:${PN}-flow += "${PN}-core"
> RDEPENDS:${PN}-pair += "${PN}-core"
> 
> FILES:${PN}-test = " \
> @@ -152,12 +148,6 @@ FILES:${PN}-names = " \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/names \
> "
> 
> -FILES:${PN}-news = " \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_news.py* \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_news*.pyc \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/news \
> -"
> -
> FILES:${PN}-runner = " \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_runner.py* \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_runner*.pyc \
> @@ -176,15 +166,7 @@ FILES:${PN}-words = " \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/words \
> "
> 
> -FILES:${PN}-flow = " \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_flow.py* \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_flow*.pyc \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/flow \
> -"
> -
> FILES:${PN}-pair = " \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_pair.py* \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_pair*.pyc \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/pair \
> "
> 
> -- 
> 2.34.1
> 
> 
> Warning: Copyright Nox Health. This communication is confidential and may 
> contain privileged information. By the use of email over the Internet or other 
> communication systems, Nox Health is not waiving either confidentiality of, or 
> legal privilege in, the content of the email and of any attachments. If the 
> recipient of this message is not the intended addressee, please call Nox Health 
> immediately by calling (+1) 888.505.0280
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110261): https://lists.openembedded.org/g/openembedded-devel/message/110261
> Mute This Topic: https://lists.openembedded.org/mt/105945946/3616948
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [mark.hatle@kernel.crashing.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Guðni Már Gilbert May 15, 2024, 8:34 a.m. UTC | #2
On Tue, May 14, 2024 at 03:38 PM, Mark Hatle wrote:

> 
> I see this change made it into meta-openembedded master. But hasn't been
> pushed to scarthgap yet.
> 
> I've having a problem with this recipe in scarthgap, and so far it looks
> like these two changes do fix the problem I'm having.
> 
> The two commits I cherry-picked back to scarthgap and tested are:
> 
> bd1b5cde348dbc20e3d332de69617a8a95fe5ff3 - python3-twisted: prepend split
> PACKAGES
> 
> 3fd6f0feec002c85df23b37c04d745a43674ee66 - python3-twisted: remove
> obsolete python3-twisted-flow
> 
> This resolves the issue I was having.
> 
> --Mark

Hi Mark, thanks for confirming the fix. The issue unfortunately wasn't found until just after the initial scarthgap release. If anyone is to blame it's me, though I've updated my testing setup moving forward so this won't happen again when sending patches upstream (I forgot to test 'installing' the package into the minimal image so didn't get the proper error message).

It's my understanding that this will only get merged into scarthgap in the next release (5.0.1) which happens about 1 once a month. According to the Yocto Project status from yesterday, 5.0.1 is in QA.

Best regards,
Gudni
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
index e5223ccd6..ba5bb04db 100644
--- a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
@@ -22,11 +22,9 @@  PACKAGES += "\
     ${PN}-conch \
     ${PN}-mail \
     ${PN}-names \
-    ${PN}-news \
     ${PN}-runner \
     ${PN}-web \
     ${PN}-words \
-    ${PN}-flow \
     ${PN}-pair \
     ${PN}-core \
 "
@@ -66,11 +64,9 @@  RDEPENDS:${PN}-test = "${PN} python3-pyhamcrest"
 RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols python3-bcrypt python3-cryptography python3-pickle"
 RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols"
 RDEPENDS:${PN}-names = "${PN}-core"
-RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols"
 RDEPENDS:${PN}-runner = "${PN}-core ${PN}-protocols"
 RDEPENDS:${PN}-web += "${PN}-core ${PN}-protocols"
 RDEPENDS:${PN}-words += "${PN}-core"
-RDEPENDS:${PN}-flow += "${PN}-core"
 RDEPENDS:${PN}-pair += "${PN}-core"
 
 FILES:${PN}-test = " \
@@ -152,12 +148,6 @@  FILES:${PN}-names = " \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/names \
 "
 
-FILES:${PN}-news = " \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_news.py* \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_news*.pyc \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/news \
-"
-
 FILES:${PN}-runner = " \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_runner.py* \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_runner*.pyc \
@@ -176,15 +166,7 @@  FILES:${PN}-words = " \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/words \
 "
 
-FILES:${PN}-flow = " \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_flow.py* \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_flow*.pyc \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/flow \
-"
-
 FILES:${PN}-pair = " \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/twisted_pair.py* \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/__pycache__/twisted_pair*.pyc \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/pair \
 "