summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2022-03-07 19:46:41 +0800
committerKhem Raj <raj.khem@gmail.com>2022-03-09 07:37:04 -0800
commit0cf785935d6a98af8bec166933119c20bb1b21a4 (patch)
treefaeaf8cc898624e5e968aa4150c49c8de19addd0 /meta-python/recipes-devtools/python
parenta44a0c859c41896f5a6c9f634710c5913df8ffd5 (diff)
downloadmeta-openembedded-0cf785935d6a98af8bec166933119c20bb1b21a4.tar.gz
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 <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Diffstat (limited to 'meta-python/recipes-devtools/python')
-rw-r--r--meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch46
-rw-r--r--meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb (renamed from meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb)6
2 files changed, 2 insertions, 50 deletions
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 @@
1From 057872fa40e061100d61117cee5c3413ef2e40fc Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 20 Jan 2022 15:18:20 +0800
4Subject: [PATCH] setupinfo.py: check the return value
5
6Use the return value altogether to check the subprocess execute
7successfully or not as in some case it will print some noise
8message though run successfully as below.
9
10 # python
11 Python 3.8.10 (default, Nov 26 2021, 20:14:08)
12 [GCC 9.3.0] on linux
13 Type "help", "copyright", "credits" or "license" for more information.
14 >>> import subprocess
15 >>> cmd = "pkg-config --modversion libxml-2.0"
16 >>> p = subprocess.Popen(cmd, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE)
17 >>> stdout_data, errors = p.communicate()
18 >>> print(stdout_data)
19 b'2.9.12\n'
20 >>> print(errors)
21 b'do_ypcall: clnt_call: RPC: Unable to send; errno = Network is unreachable\n'
22 >>>
23
24Upstream-Status: Submitted [https://github.com/lxml/lxml/pull/336]
25
26Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
27---
28 setupinfo.py | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31diff --git a/setupinfo.py b/setupinfo.py
32index 8c2a36fb..c1247c6d 100644
33--- a/setupinfo.py
34+++ b/setupinfo.py
35@@ -365,7 +365,7 @@ def run_command(cmd, *args):
36 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
37 stdout_data, errors = p.communicate()
38
39- if errors:
40+ if p.returncode != 0 and errors:
41 return ''
42 return decode_input(stdout_data).strip()
43
44--
452.17.1
46
diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb b/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb
index f3b7e0c6cd..c4d4df383a 100644
--- a/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb
+++ b/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb
@@ -18,11 +18,9 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \
18 18
19DEPENDS += "libxml2 libxslt" 19DEPENDS += "libxml2 libxslt"
20 20
21SRC_URI[sha256sum] = "a1613838aa6b89af4ba10a0f3a972836128801ed008078f8c1244e65958f1b24" 21SRC_URI[sha256sum] = "f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23"
22 22
23SRC_URI += " \ 23SRC_URI += "${PYPI_SRC_URI}"
24 file://0001-setupinfo.py-check-the-return-value.patch \
25"
26inherit pkgconfig pypi setuptools3 24inherit pkgconfig pypi setuptools3
27 25
28# {standard input}: Assembler messages: 26# {standard input}: Assembler messages: