diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-24 09:08:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-25 21:55:10 +0000 |
commit | 98b85e193e37f6d9a74b472224949a74901a41a1 (patch) | |
tree | 4b6eabc251fd0ca1db3834beb185778058b999d9 /meta/recipes-devtools | |
parent | 13588826a5bc32b5d9128f3b51444ec713a1ead4 (diff) | |
download | poky-98b85e193e37f6d9a74b472224949a74901a41a1.tar.gz |
python3-packaging: update 21.2 -> 21.3
(From OE-Core rev: f1b1eaf63cd0a762f149d2fed9cbef98eb7f4977)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-packaging_21.3.bb (renamed from meta/recipes-devtools/python/python3-packaging_21.2.bb) | 4 |
2 files changed, 1 insertions, 40 deletions
diff --git a/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch b/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch deleted file mode 100644 index 42b1dc133f..0000000000 --- a/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 8cb9dbf19e2b76ab025efc11208bd50e09e8223e Mon Sep 17 00:00:00 2001 | ||
2 | From: Moyiz <8603313+moyiz@users.noreply.github.com> | ||
3 | Date: Tue, 2 Nov 2021 21:42:53 +0200 | ||
4 | Subject: [PATCH] Revert pyparsing constraint (#482) | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | setup.py | 2 +- | ||
10 | tests/test_requirements.py | 4 +++- | ||
11 | 4 files changed, 6 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/setup.py b/setup.py | ||
14 | index c6a1caec..419aa284 100644 | ||
15 | --- a/setup.py | ||
16 | +++ b/setup.py | ||
17 | @@ -48,7 +48,7 @@ | ||
18 | author=about["__author__"], | ||
19 | author_email=about["__email__"], | ||
20 | python_requires=">=3.6", | ||
21 | - install_requires=["pyparsing>=2.0.2,<3"], # Needed to avoid issue #91 | ||
22 | + install_requires=["pyparsing>=2.0.2"], # Needed to avoid issue #91 | ||
23 | classifiers=[ | ||
24 | "Development Status :: 5 - Production/Stable", | ||
25 | "Intended Audience :: Developers", | ||
26 | diff --git a/tests/test_requirements.py b/tests/test_requirements.py | ||
27 | index 8cc45687..f2c209c4 100644 | ||
28 | --- a/tests/test_requirements.py | ||
29 | +++ b/tests/test_requirements.py | ||
30 | @@ -192,4 +192,6 @@ def test_sys_platform_linux_in(self): | ||
31 | def test_parseexception_error_msg(self): | ||
32 | with pytest.raises(InvalidRequirement) as e: | ||
33 | Requirement("toto 42") | ||
34 | - assert "Expected stringEnd" in str(e.value) | ||
35 | + assert "Expected stringEnd" in str(e.value) or ( | ||
36 | + "Expected string_end" in str(e.value) # pyparsing>=3.0.0 | ||
37 | + ) | ||
diff --git a/meta/recipes-devtools/python/python3-packaging_21.2.bb b/meta/recipes-devtools/python/python3-packaging_21.3.bb index 5e9541082f..446edf04e1 100644 --- a/meta/recipes-devtools/python/python3-packaging_21.2.bb +++ b/meta/recipes-devtools/python/python3-packaging_21.3.bb | |||
@@ -3,9 +3,7 @@ HOMEPAGE = "https://github.com/pypa/packaging" | |||
3 | LICENSE = "Apache-2.0 | BSD-2-Clause" | 3 | LICENSE = "Apache-2.0 | BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966" | 6 | SRC_URI[sha256sum] = "dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb" |
7 | |||
8 | SRC_URI += "file://8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch" | ||
9 | 7 | ||
10 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
11 | 9 | ||