From 98b85e193e37f6d9a74b472224949a74901a41a1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 24 Nov 2021 09:08:27 +0100 Subject: python3-packaging: update 21.2 -> 21.3 (From OE-Core rev: f1b1eaf63cd0a762f149d2fed9cbef98eb7f4977) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch | 37 ---------------------- .../python/python3-packaging_21.2.bb | 15 --------- .../python/python3-packaging_21.3.bb | 13 ++++++++ 3 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch delete mode 100644 meta/recipes-devtools/python/python3-packaging_21.2.bb create mode 100644 meta/recipes-devtools/python/python3-packaging_21.3.bb (limited to 'meta') 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 ---- - 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.2.bb deleted file mode 100644 index 5e9541082f..0000000000 --- a/meta/recipes-devtools/python/python3-packaging_21.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Core utilities for Python packages" -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" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS += "${PYTHON_PN}-setuptools-native" -RDEPENDS:${PN} += "${PYTHON_PN}-pyparsing" diff --git a/meta/recipes-devtools/python/python3-packaging_21.3.bb b/meta/recipes-devtools/python/python3-packaging_21.3.bb new file mode 100644 index 0000000000..446edf04e1 --- /dev/null +++ b/meta/recipes-devtools/python/python3-packaging_21.3.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Core utilities for Python packages" +HOMEPAGE = "https://github.com/pypa/packaging" +LICENSE = "Apache-2.0 | BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" + +SRC_URI[sha256sum] = "dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" + +DEPENDS += "${PYTHON_PN}-setuptools-native" +RDEPENDS:${PN} += "${PYTHON_PN}-pyparsing" -- cgit v1.2.3-54-g00ecf