diff mbox series

[meta-python] python3-twisted: upgrade 22.10.0 -> 24.3.0

Message ID 20240418090122.3806-1-gudnimar@noxmedical.com
State Under Review
Headers show
Series [meta-python] python3-twisted: upgrade 22.10.0 -> 24.3.0 | expand

Commit Message

Guðni Már Gilbert April 18, 2024, 9:01 a.m. UTC
Changelogs between 22.10.0 and 24.3.0 can be found here:

https://github.com/twisted/twisted/releases/tag/twisted-24.3.0
https://github.com/twisted/twisted/releases/tag/twisted-23.10.0
https://github.com/twisted/twisted/releases/tag/twisted-23.8.0

Summary of changes relevant for the Yocto build:
- Brings official support for Python 3.11 and 3.12, only Python 3.8 and above supported.
- python3-twisted-conch: python3-pyasn1 is no longer a runtime dependency (23.8.0)
- PYPI_PACKAGE name was changed from 'Twisted' to 'twisted' to make fetching work

Signed-off-by: Guðni Már Gilbert <gudnimar@noxmedical.com>
---
 ...twisted_22.10.0.bb => python3-twisted_24.3.0.bb} | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-twisted_22.10.0.bb => python3-twisted_24.3.0.bb} (93%)

Comments

Tim Orling April 18, 2024, 2:28 p.m. UTC | #1
On Thu, Apr 18, 2024 at 2:01 AM Guðni Már Gilbert via lists.openembedded.org
<gudnimar=noxmedical.com@lists.openembedded.org> wrote:

> Changelogs between 22.10.0 and 24.3.0 can be found here:
>
> https://github.com/twisted/twisted/releases/tag/twisted-24.3.0
> https://github.com/twisted/twisted/releases/tag/twisted-23.10.0
> https://github.com/twisted/twisted/releases/tag/twisted-23.8.0
>
> Summary of changes relevant for the Yocto build:
> - Brings official support for Python 3.11 and 3.12, only Python 3.8 and
> above supported.
> - python3-twisted-conch: python3-pyasn1 is no longer a runtime dependency
> (23.8.0)
> - PYPI_PACKAGE name was changed from 'Twisted' to 'twisted' to make
> fetching work
>
> Signed-off-by: Guðni Már Gilbert <gudnimar@noxmedical.com>
> ---
> ...twisted_22.10.0.bb => python3-twisted_24.3.0.bb} | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
> rename meta-python/recipes-devtools/python/{python3-twisted_22.10.0.bb =>
> python3-twisted_24.3.0.bb} (93%)
>
> diff --git a/meta-python/recipes-devtools/python/
> python3-twisted_22.10.0.bb b/meta-python/recipes-devtools/python/
> python3-twisted_24.3.0.bb
> similarity index 93%
> rename from meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb
> rename to meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
> index 20b9ce254..be2246623 100644
> --- a/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
> @@ -4,11 +4,11 @@ Twisted supports TCP, UDP, SSL/TLS, multicast, Unix
> sockets, a large number of p
> HOMEPAGE = "http://www.twistedmatrix.com"
>
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=0f8d67f84b6e178c92d471011b2245fc"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c5d2c2493b848f83864bdedd67bbf5"
>
> -SRC_URI[sha256sum] =
> "32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31"
> +SRC_URI[sha256sum] =
> "6b38b6ece7296b5e122c9eb17da2eeab3d98a198f50ca9efd00fb03e5b4fd4ae"
>
> -PYPI_PACKAGE = "Twisted"
> +PYPI_PACKAGE = "twisted"
>

This is the default, so not explicitly needed. The capitalized name was
previously needed to match the tarball file name.


>
> inherit pypi python_setuptools_build_meta
>
> @@ -65,7 +65,7 @@ RDEPENDS:${PN}-core = "python3-appdirs \
> python3-zopeinterface \
> "
> RDEPENDS:${PN}-test = "${PN}"
> -RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols python3-bcrypt
> python3-cryptography python3-pyasn1 python3-pickle"
> +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"
> @@ -75,8 +75,6 @@ RDEPENDS:${PN}-words += "${PN}-core"
> RDEPENDS:${PN}-flow += "${PN}-core"
> RDEPENDS:${PN}-pair += "${PN}-core"
>
> -FILES:${PN} =
> "${PYTHON_SITEPACKAGES_DIR}/${PYPI_PACKAGE}-${PV}.dist-info/*"
> -
> FILES:${PN}-test = " \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/test \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/*/test \
> @@ -85,8 +83,6 @@ FILES:${PN}-test = " \
>
> FILES:${PN}-protocols = " \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/*.py* \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/gps/ \
> - ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/mice/ \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/haproxy \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/__pycache__/*pyc \
> "
> @@ -124,7 +120,6 @@ FILES:${PN}-core = " \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/*.py* \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/python/*.py* \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/*.py* \
> - ${PYTHON_SITEPACKAGES_DIR}/Twisted*egg-info \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/logger \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/_threads \
> ${PYTHON_SITEPACKAGES_DIR}/twisted/positioning \
> --
> 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 (#110049):
> https://lists.openembedded.org/g/openembedded-devel/message/110049
> Mute This Topic: https://lists.openembedded.org/mt/105594516/924729
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> ticotimo@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Guðni Már Gilbert April 18, 2024, 9:37 p.m. UTC | #2
Hi Tim, good to know :)

I see this patch has already made it to master-next branch, I can remove the PYPI_PACKAGE line in a future patch after I have built it locally to verify.

I'm hoping to backport this upgrade to Scarthgap as well so the latest LTS is not ~2 years out of date.

I'm sure I will contribute more for the twisted recipe if I find any further improvements/cleanup. I believe we can split twisted-core into more independent packages, but I will take my time with those changes before submitting them so it may take a while.
Khem Raj April 18, 2024, 11:32 p.m. UTC | #3
On Thu, Apr 18, 2024 at 2:38 PM Guðni Már Gilbert via
lists.openembedded.org
<gudnimar=noxmedical.com@lists.openembedded.org> wrote:
>
> Hi Tim, good to know :)
>
> I see this patch has already made it to master-next branch, I can remove the PYPI_PACKAGE line in a future patch after I have built it locally to verify.

master-next is staging many patches and is always in flux and
primarily meant for CI, so please send a v2 of this with the feedback
addressed.

>
> I'm hoping to backport this upgrade to Scarthgap as well so the latest LTS is not ~2 years out of date.
>
> I'm sure I will contribute more for the twisted recipe if I find any further improvements/cleanup. I believe we can split twisted-core into more independent packages, but I will take my time with those changes before submitting them so it may take a while.
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110055): https://lists.openembedded.org/g/openembedded-devel/message/110055
> Mute This Topic: https://lists.openembedded.org/mt/105594516/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Guðni Már Gilbert April 19, 2024, 8:05 a.m. UTC | #4
On Thu, Apr 18, 2024 at 11:33 PM, Khem Raj wrote:

> 
> master-next is staging many patches and is always in flux and
> primarily meant for CI, so please send a v2 of this with the feedback
> addressed.

Hi Khem,
Thank you for the reply, I did not know this. I will then submit a new patch. I'm currently travelling but will post the patch likely next Monday. :)
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
similarity index 93%
rename from meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb
rename to meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
index 20b9ce254..be2246623 100644
--- a/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb
@@ -4,11 +4,11 @@  Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of p
 HOMEPAGE = "http://www.twistedmatrix.com"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0f8d67f84b6e178c92d471011b2245fc"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c5d2c2493b848f83864bdedd67bbf5"
 
-SRC_URI[sha256sum] = "32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31"
+SRC_URI[sha256sum] = "6b38b6ece7296b5e122c9eb17da2eeab3d98a198f50ca9efd00fb03e5b4fd4ae"
 
-PYPI_PACKAGE = "Twisted"
+PYPI_PACKAGE = "twisted"
 
 inherit pypi python_setuptools_build_meta
 
@@ -65,7 +65,7 @@  RDEPENDS:${PN}-core = "python3-appdirs \
                        python3-zopeinterface \
 "
 RDEPENDS:${PN}-test = "${PN}"
-RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols python3-bcrypt python3-cryptography python3-pyasn1 python3-pickle"
+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"
@@ -75,8 +75,6 @@  RDEPENDS:${PN}-words += "${PN}-core"
 RDEPENDS:${PN}-flow += "${PN}-core"
 RDEPENDS:${PN}-pair += "${PN}-core"
 
-FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/${PYPI_PACKAGE}-${PV}.dist-info/*"
-
 FILES:${PN}-test = " \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/test \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/*/test \
@@ -85,8 +83,6 @@  FILES:${PN}-test = " \
 
 FILES:${PN}-protocols = " \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/*.py* \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/gps/ \
-    ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/mice/ \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/haproxy \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/__pycache__/*pyc \
 "
@@ -124,7 +120,6 @@  FILES:${PN}-core = " \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/*.py* \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/python/*.py* \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/*.py* \
-    ${PYTHON_SITEPACKAGES_DIR}/Twisted*egg-info \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/logger \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/_threads \
     ${PYTHON_SITEPACKAGES_DIR}/twisted/positioning \