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:53:44 +0000 |
| commit | f1b1eaf63cd0a762f149d2fed9cbef98eb7f4977 (patch) | |
| tree | 042684a1fd54a22b320d723a0c88f022ed48b397 | |
| parent | cf024ecc5d19876ef6bd9a93606fae64426a0e4c (diff) | |
| download | openembedded-core-contrib-f1b1eaf63cd0a762f149d2fed9cbef98eb7f4977.tar.gz | |
python3-packaging: update 21.2 -> 21.3
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ -From 8cb9dbf19e2b76ab025efc11208bd50e09e8223e Mon Sep 17 00:00:00 2001 -From: Moyiz <8603313+moyiz@users.noreply.github.com> -Date: Tue, 2 Nov 2021 21:42:53 +0200 -Subject: [PATCH] Revert pyparsing constraint (#482) - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - setup.py | 2 +- - tests/test_requirements.py | 4 +++- - 4 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index c6a1caec..419aa284 100644 ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,7 @@ - author=about["__author__"], - author_email=about["__email__"], - python_requires=">=3.6", -- install_requires=["pyparsing>=2.0.2,<3"], # Needed to avoid issue #91 -+ install_requires=["pyparsing>=2.0.2"], # Needed to avoid issue #91 - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", -diff --git a/tests/test_requirements.py b/tests/test_requirements.py -index 8cc45687..f2c209c4 100644 ---- a/tests/test_requirements.py -+++ b/tests/test_requirements.py -@@ -192,4 +192,6 @@ def test_sys_platform_linux_in(self): - def test_parseexception_error_msg(self): - with pytest.raises(InvalidRequirement) as e: - Requirement("toto 42") -- assert "Expected stringEnd" in str(e.value) -+ assert "Expected stringEnd" in str(e.value) or ( -+ "Expected string_end" in str(e.value) # pyparsing>=3.0.0 -+ ) 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" LICENSE = "Apache-2.0 | BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" -SRC_URI[sha256sum] = "096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966" - -SRC_URI += "file://8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch" +SRC_URI[sha256sum] = "dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb" inherit pypi setuptools3 |