From 0cf785935d6a98af8bec166933119c20bb1b21a4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 7 Mar 2022 19:46:41 +0800 Subject: python3-lxml: upgrade 4.7.1 -> 4.8.0 0001-setupinfo.py-check-the-return-value.patch removed since it's included in 4.8.0. Changelog: ========= Features added -------------- * GH#337: Path-like objects are now supported throughout the API instead of just strings. Patch by Henning Janssen. * The ''ElementMaker'' now supports ''QName'' values as tags, which always override the default namespace of the factory. Bugs fixed ---------- * GH#338: In lxml.objectify, the XSI float annotation "nan" and "inf" were spelled in lower case, whereas XML Schema datatypes define them as "NaN" and "INF" respectively. Patch by Tobias Deiminger. Other changes ------------- * Built with Cython 0.29.28. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../0001-setupinfo.py-check-the-return-value.patch | 46 ---------------------- .../recipes-devtools/python/python3-lxml_4.7.1.bb | 44 --------------------- .../recipes-devtools/python/python3-lxml_4.8.0.bb | 42 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 90 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch delete mode 100644 meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch b/meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch deleted file mode 100644 index 7d9121846f..0000000000 --- a/meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 057872fa40e061100d61117cee5c3413ef2e40fc Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 20 Jan 2022 15:18:20 +0800 -Subject: [PATCH] setupinfo.py: check the return value - -Use the return value altogether to check the subprocess execute -successfully or not as in some case it will print some noise -message though run successfully as below. - - # python - Python 3.8.10 (default, Nov 26 2021, 20:14:08) - [GCC 9.3.0] on linux - Type "help", "copyright", "credits" or "license" for more information. - >>> import subprocess - >>> cmd = "pkg-config --modversion libxml-2.0" - >>> p = subprocess.Popen(cmd, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE) - >>> stdout_data, errors = p.communicate() - >>> print(stdout_data) - b'2.9.12\n' - >>> print(errors) - b'do_ypcall: clnt_call: RPC: Unable to send; errno = Network is unreachable\n' - >>> - -Upstream-Status: Submitted [https://github.com/lxml/lxml/pull/336] - -Signed-off-by: Mingli Yu ---- - setupinfo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setupinfo.py b/setupinfo.py -index 8c2a36fb..c1247c6d 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -365,7 +365,7 @@ def run_command(cmd, *args): - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout_data, errors = p.communicate() - -- if errors: -+ if p.returncode != 0 and errors: - return '' - return decode_input(stdout_data).strip() - --- -2.17.1 - diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb b/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb deleted file mode 100644 index f3b7e0c6cd..0000000000 --- a/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." -DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ -libxslt libraries. It provides safe and convenient access to these \ -libraries using the ElementTree API. It extends the ElementTree API \ -significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ -C14N and much more." -HOMEPAGE = "https://lxml.de/" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause & GPL-2.0-only & MIT & PSF-2.0" -LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ - file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ - file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ - file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ - file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ - file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ - " - -DEPENDS += "libxml2 libxslt" - -SRC_URI[sha256sum] = "a1613838aa6b89af4ba10a0f3a972836128801ed008078f8c1244e65958f1b24" - -SRC_URI += " \ - file://0001-setupinfo.py-check-the-return-value.patch \ -" -inherit pkgconfig pypi setuptools3 - -# {standard input}: Assembler messages: -# {standard input}:1488805: Error: branch out of range -DEBUG_OPTIMIZATION:remove:mips = " -Og" -DEBUG_OPTIMIZATION:append:mips = " -O" -BUILD_OPTIMIZATION:remove:mips = " -Og" -BUILD_OPTIMIZATION:append:mips = " -O" - -DEBUG_OPTIMIZATION:remove:mipsel = " -Og" -DEBUG_OPTIMIZATION:append:mipsel = " -O" -BUILD_OPTIMIZATION:remove:mipsel = " -Og" -BUILD_OPTIMIZATION:append:mipsel = " -O" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" - -CLEANBROKEN = "1" diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb b/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb new file mode 100644 index 0000000000..c4d4df383a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ +libxslt libraries. It provides safe and convenient access to these \ +libraries using the ElementTree API. It extends the ElementTree API \ +significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ +C14N and much more." +HOMEPAGE = "https://lxml.de/" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause & GPL-2.0-only & MIT & PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ + file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ + file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ + file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ + file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ + file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ + " + +DEPENDS += "libxml2 libxslt" + +SRC_URI[sha256sum] = "f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23" + +SRC_URI += "${PYPI_SRC_URI}" +inherit pkgconfig pypi setuptools3 + +# {standard input}: Assembler messages: +# {standard input}:1488805: Error: branch out of range +DEBUG_OPTIMIZATION:remove:mips = " -Og" +DEBUG_OPTIMIZATION:append:mips = " -O" +BUILD_OPTIMIZATION:remove:mips = " -Og" +BUILD_OPTIMIZATION:append:mips = " -O" + +DEBUG_OPTIMIZATION:remove:mipsel = " -Og" +DEBUG_OPTIMIZATION:append:mipsel = " -O" +BUILD_OPTIMIZATION:remove:mipsel = " -Og" +BUILD_OPTIMIZATION:append:mipsel = " -O" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" + +CLEANBROKEN = "1" -- cgit v1.2.3-54-g00ecf