diff options
Diffstat (limited to 'meta-openembedded/meta-python')
87 files changed, 293 insertions, 327 deletions
diff --git a/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch index df95a4c138..04d2da8ef2 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch +++ b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/remove_duplicate_install.patch @@ -2,14 +2,14 @@ commit f6c67662145de889055a86a6b3b12c70a45fc8d5 Author: Dongxiao Xu <dongxiao.xu@intel.com> Date: Wed Sep 7 16:02:20 2011 +0800 - Avoid duplicated installation of errors.py +Avoid duplicated installation of errors.py - newer version of autotools don't seem to like listing files to install - twice. Remove one errors.py from the installation list. +newer version of autotools don't seem to like listing files to install +twice. Remove one errors.py from the installation list. - Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> +Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - Upstream-Status: Inappropirate [upstream inactive] +Upstream-Status: Inappropriate [upstream inactive] diff --git a/src/Makefile.am b/src/Makefile.am index 5c27dfe..7536e43 100644 diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 2275ccd6c5..2428674c42 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -157,6 +157,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-gmqtt \ python3-gnupg \ python3-google-api-python-client \ + python3-gpiod \ python3-gpsd-py3 \ python3-graphviz \ python3-greenlet \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch deleted file mode 100644 index b3180f29f2..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a681a79472df85cdc8c052bc61fb8b9e7b9a6495 Mon Sep 17 00:00:00 2001 -From: Tim Orling <tim.orling@konsulko.com> -Date: Sun, 27 Feb 2022 11:50:36 -0800 -Subject: [PATCH] setup.py: switch from distutils to setuptools - -In Python 3.10, distutils is deprecated and slated for removal in Python -3.12. It also prevents 'setup.py bdist_wheel' from building a wheel. - -Upstream-Status: Submitted -[https://github.com/systemd/python-systemd/pull/103] - -Signed-off-by: Tim Orling <tim.orling@konsulko.com> ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 099819b..fe9c03a 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,5 +1,5 @@ - import sys, os --from distutils.core import setup, Extension -+from setuptools import setup, Extension - from subprocess import Popen, PIPE, check_output - - def call(*cmd): --- -2.30.2 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/endian.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/endian.patch deleted file mode 100644 index e09aea7336..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/endian.patch +++ /dev/null @@ -1,14 +0,0 @@ -Include endian.h for missing definitions of htobe16 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/systemd/util.c -+++ b/systemd/util.c -@@ -28,6 +28,7 @@ - #include <stdbool.h> - #include <assert.h> - #include <errno.h> -+#include <endian.h> - #include <fcntl.h> - #include <unistd.h> - #include <net/if.h> diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_22.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.1.0.bb index 40ac76efd5..c06f09fb6a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_22.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.1.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" -SRC_URI[sha256sum] = "9107f1ca0b2a5553987a94a3c9959fe5b491fdf731389aa5b7b1bd0733e32de6" +SRC_URI[sha256sum] = "edd247df9a19e0db16534d4baaf536d6609a43e1de5401d7a4c1c148753a1635" PYPI_PACKAGE = "aiofiles" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb index c86ec092a6..68cbb265f4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb @@ -3,7 +3,7 @@ SUMMARY = "jinja2 template renderer for aiohttp.web (http server for asyncio)" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=29dca541e03964615590ca7b50392d97" -SRC_URI[sha256sum] = "7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b" +SRC_URI[sha256sum] = "8d149b2a57d91f794b33a394ea5bc66b567f38c74a5a6a9477afc2450f105c01" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.4.bb index b233b3ac9a..926801dc74 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41" -SRC_URI[sha256sum] = "3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269" +SRC_URI[sha256sum] = "bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c" PYPI_PACKAGE = "aiohttp" inherit python_setuptools_build_meta pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.4.bb index 0d83f86c41..7f9ac2ec91 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.9.4.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3023b042cb6002cb398344b51c67093" inherit pypi setuptools3 -SRC_URI[sha256sum] = "6880dec4f28dd7bd999d2ed13fbe7c9d4337700a44d11a524c0ce0c59aaf0dbd" +SRC_URI[sha256sum] = "4d3bd32ecdbb7bbfb48a9fe9e6d6fd6a831a1b59d03e26e292210237373e7db5" PYPI_PACKAGE = "alembic" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.12.0.bb index 535dc022da..1c8c709773 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.12.0.bb @@ -1,8 +1,8 @@ SUMMARY = "ANTLR runtime for Python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9a0a1d20e667cf7ab7c59357cf8b4812" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=ab3c64dc056e158882a9a6b35a2f4a6e" -SRC_URI[sha256sum] = "a53de701312f9bdacc5258a6872cd6c62b90d3a90ae25e494026f76267333b60" +SRC_URI[sha256sum] = "0a8b82f55032734f43ed6b60b8a48c25754721a75cd714eb1fe9ce6ed418b361" PYPI_PACKAGE = "antlr4-python3-runtime" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch deleted file mode 100644 index 174f088e9e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d3ae6ac951cc5bbce29b9c987741e0a557c9b777 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro> -Date: Sun, 2 May 2021 09:50:43 +0300 -Subject: [PATCH] Remove tornado<6 test constraint. Ref #15. - -Upstream-Status: Backport [https://github.com/ionelmc/python-aspectlib/commit/7dccb198dfb426f529b81a28a755f3c02f8b50cb] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/test_integrations_py3.py | 5 ++++- - tox.ini | 3 ++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tests/test_integrations_py3.py b/tests/test_integrations_py3.py -index e025eac..596589d 100644 ---- a/tests/test_integrations_py3.py -+++ b/tests/test_integrations_py3.py -@@ -36,7 +36,10 @@ def test_decorate_tornado_coroutine(): - @gen.coroutine - @debug.log(print_to=buf, module=False, stacktrace=2, result_repr=repr) - def coro(): -- yield gen.Task(loop.add_timeout, timedelta(microseconds=10)) -+ if hasattr(gen, 'Task'): -+ yield gen.Task(loop.add_timeout, timedelta(microseconds=10)) -+ else: -+ yield gen.sleep(0.01) - return "result" - - loop = ioloop.IOLoop.current() -diff --git a/tox.ini b/tox.ini -index 8c607de..08c31b3 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -55,7 +55,8 @@ deps = - pytest-clarity - pytest-cov - pytest-travis-fold -- tornado<6.0 -+ six -+ tornado - commands = - {posargs:pytest --cov --cov-report=term-missing -vv --ignore=src} - --- -2.32.0 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib_2.0.0.bb index 71f3d3594e..416b031c5e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib_2.0.0.bb @@ -6,14 +6,13 @@ DESCRIPTION = " It is useful when changing behavior in existing code is desired. It includes tools for debugging and testing: simple mock/record and a complete capture/replay framework." HOMEPAGE = "https://github.com/ionelmc/python-aspectlib" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d58b3f20fd10347a9458b8a03793b62e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=80721ace117fd1f814049ecb81c6be76" -SRC_URI[sha256sum] = "d275ec82c4c2712e564bb760e4accff8f061f648e38774feabeb8b241cf3a4aa" +SRC_URI[sha256sum] = "a4b461b9da0b531aebcb93efcde3de808a72c60226dd8d902c467d13faf7ce92" inherit ptest pypi setuptools3 SRC_URI += "file://run-ptest \ - file://0001-Remove-tornado-6-test-constraint.-Ref-15.patch \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.13.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.14.2.bb index fa22080d36..e8b86071a3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.13.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.14.2.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "3bc7834720e1a24ca797fd785d77efb14f7a28ee8e635ef040b6e2d80ccb3303" +SRC_URI[sha256sum] = "a3cf9f02c53dd259144a7e8f3ccd75d67c9a8c716ef183e0c1f291bc5d7bb3cf" SRC_URI += " \ file://0001-pyproject.toml-Replace-with.patch \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.1.2.bb index b67e900685..26f85e2a47 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.1.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://crossbar.io/autobahn" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3e2c2c2cc2915edc5321b0e6b1d3f5f8" -SRC_URI[sha256sum] = "a88882ab4700ee9eee46c69c38e2b625f6fda48ab1ce61cf7b58b23cf2fadcb8" +SRC_URI[sha256sum] = "c5ef8ca7422015a1af774a883b8aef73d4954c9fcd182c9b5244e08e973f7c3a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.7.3.bb index 1b225c3fae..f766692a0f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.7.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "90bac83ba6c37ab5048b43e07eba7d0de12f301ad6641633656fa269618a7301" +SRC_URI[sha256sum] = "f71256a32609b036adad932e1228b66a6b4e2cae6be397e588ddc0babd9a78b9" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.17.0.bb index fe3aeb7b58..d1d30cdb3c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.17.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/bitstruct" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "6fa6adbfb8f3b8cb68c21b13aa65d23eb2c3ac32419ab926f3fd1fff717a9125" +SRC_URI[sha256sum] = "eb94b40e4218a23aa8f90406b836a9e6ed83e48b8d112ce3f96408463bd1b874" PYPI_PACKAGE = "bitstruct" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.2.bb index c116063510..0035735830 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_38.0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "be391520a43c8041ba99839a00a0a61b7afa929387def6c6348a9626b99f24d7" +SRC_URI[sha256sum] = "93bfe6f4bd652f369763ea9162b027a62f424a8400f2423d41137918ce68c68e" PYPI_PACKAGE = "cantools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb index d2434b626f..29d790b94f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb @@ -1,11 +1,11 @@ SUMMARY = "Extra features for standard library's cmd module" HOMEPAGE = "https://github.com/python-cmd2/cmd2" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=209e288518b0668115f58c3929af9ff1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fad7740aa21780c8b9a214f5b320b4ad" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -SRC_URI[sha256sum] = "073e555c05853b0f6965f3d03329babdf9e38a5f2cea028e61a64cd7eeb74ad5" +SRC_URI[sha256sum] = "71873c11f72bd19e2b1db578214716f0d4f7c8fa250093c601265a9a717dee52" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.2.0.bb index 98f0f191c6..c51f9ca553 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.0.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "051afcbd6d2ac39298d62d340f94dbb6a1f31de06dfaf6fcef7b759dd3860c45" +SRC_URI[sha256sum] = "9cc9c41aa5af16d845b53287051340c363dd03b7ef408e45eec3af52be77810d" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_2.3.2.bb new file mode 100644 index 0000000000..49b094fce0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_2.3.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to implement a well-behaved Unix daemon process" +HOMEPAGE = "https://pagure.io/python-daemon/" +SECTION = "devel/python" + +DEPENDS += "${PYTHON_PN}-docutils-native" +RDEPENDS:${PN} = "${PYTHON_PN}-docutils \ + ${PYTHON_PN}-lockfile (>= 0.10) \ + ${PYTHON_PN}-resource \ +" + +LICENSE = "Apache-2.0 & GPL-3.0-only" +LIC_FILES_CHKSUM = "file://README;md5=a3a94c615dc969a70525f1eebbacf235" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "b7397fe73d516dc14921500a1245b41c" +SRC_URI[sha256sum] = "3deeb808e72b6b89f98611889e11cc33754f5b2c1517ecfa1aaf25f402051fb5" + +PYPI_PACKAGE = "python-daemon" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.7.bb index 80869d0163..4d592308ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.1.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/scrapinghub/dateparser" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051" -SRC_URI[sha256sum] = "e703db1815270c020552f4b3e3a981937b48b2cbcfcef5347071b74788dd9214" +SRC_URI[sha256sum] = "ff047d9cffad4d3113ead8ec0faf8a7fc43bab7d853ac8715e071312b53c465a" PYPI_PACKAGE = "dateparser" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.1.7.bb index 6d800982af..be806eefaa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.1.7.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1" +SRC_URI[sha256sum] = "44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.0.1.bb index 661259f467..22de9d4340 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "cca18742dc0f354f79874c41a906e6ce4cc15230b7858d22a861e1ec5946940f" +SRC_URI[sha256sum] = "1162e4c8e5501bd36291b668f4449b8125fea5ef64a26da8d71da31126725aa5" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keyfile/0001-setup-don-t-use-setuptools-markdown.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keyfile/0001-setup-don-t-use-setuptools-markdown.patch deleted file mode 100644 index 7b81203807..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keyfile/0001-setup-don-t-use-setuptools-markdown.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4348c72877e049804c7cdb7eec7a6bcd7ac2ea1d Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski <brgl@bgdev.pl> -Date: Wed, 11 May 2022 13:21:30 +0200 -Subject: [PATCH] setup: don't use setuptools-markdown - -This project is deprecated and irrelevant for the functionality of -eth-keyfile. We don't support it in meta-python so just drop it from -the dependencies. - -Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> ---- - setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/setup.py b/setup.py -index cbb7f4c..7702aa4 100644 ---- a/setup.py -+++ b/setup.py -@@ -51,14 +51,12 @@ setup( - "A library for handling the encrypted keyfiles used to store ethereum " - "private keys." - ), -- long_description_markdown_filename='README.md', - author='Piper Merriam', - author_email='pipermerriam@gmail.com', - url='https://github.com/ethereum/eth-keyfile', - include_package_data=True, - install_requires=install_requires, - extras_require=deps, -- setup_requires=['setuptools-markdown'], - py_modules=['eth_keyfile'], - license="MIT", - zip_safe=False, --- -2.34.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.1.bb index 9477632e2f..55ab1a78da 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keyfile_0.6.1.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2beaef1b1764f4d6b46084c885b4bcad" -SRC_URI[sha256sum] = "d30597cdecb8ccd3b56bb275cd86fcdc7a279f86eafa92ddc49f66512f0bff67" -SRC_URI += "file://0001-setup-don-t-use-setuptools-markdown.patch" +SRC_URI[sha256sum] = "471be6e5386fce7b22556b3d4bde5558dbce46d2674f00848027cb0a20abdc8c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb index 659a86dae3..c091040c5d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb @@ -1,9 +1,9 @@ SUMMARY = "Python evdev lib" HOMEPAGE = "https://github.com/gvalkov/python-evdev" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0ff275b442f45fc06287544cf713016f" -SRC_URI[sha256sum] = "ecfa01b5c84f7e8c6ced3367ac95288f43cd84efbfd7dd7d0cdbfc0d18c87a6a" +SRC_URI[sha256sum] = "299db8628cc73b237fc1cc57d3c2948faa0756e2a58b6194b5bf81dc2081f1e3" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.2.1.bb deleted file mode 100644 index 0db33052ff..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Super-fast and clean conversions to numbers." -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" - -PYPI_PACKAGE = "fastnumbers" - -SRC_URI[sha256sum] = "44f92b42e7e9f2ed77ba5cb7d664f05c17e43d4586718ed6cd3b3fffa0e67f33" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_4.0.1.bb new file mode 100644 index 0000000000..e3a0c6c0fc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_4.0.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Super-fast and clean conversions to numbers." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=58db8ac9e152dd9b700f4d39ff40a31a" + +PYPI_PACKAGE = "fastnumbers" + +SRC_URI[sha256sum] = "3e7d74b1debb44c4803c0fea59a63d0785d6a26ebcb902e2262b3c3fba81b400" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.4.bb index 7d3ac9e32c..d9df2a4270 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[sha256sum] = "f62b51f9cd2c4f444deac111726a2335d0b846dcf51909a97e261d2098b816f7" +SRC_URI[sha256sum] = "73293d40b10ac17736e715b377e7b7bde474cb8105165d77474df4c3619b10b3" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.1.bb index 92d78674e9..ec47fcac2c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple integration of Flask and WTForms." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d98d089889e14b227732d45dac3aacc4" -SRC_URI[sha256sum] = "10fd267a41b6dee4f433ec8d6507d4cce4f1d71700280cf654a7cdbae6408d47" +SRC_URI[sha256sum] = "41c4244e9ae626d63bed42ae4785b90667b885b1535d5a4095e1f63060d12aa9" PYPI_PACKAGE = "Flask-WTF" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.2.3.bb index cceab72ede..90c56c75a4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.2.3.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "642c450d19c4ad482f96729bd2a8f6d32554aa1e231f4f6b4e7e5264b16cca2b" +SRC_URI[sha256sum] = "7eb373984bf1c770023fce9db164ed0c3353cd0b53f130f4693da0ca756a2e6d" PYPI_PACKAGE = "Flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.72.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.79.0.bb index d0e94d8fbb..5c9ade0918 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.72.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.79.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "0ddf4a44256d4516635578b93a9ac0dfba7d8bd357cd896e68ef9c549a840b2f" +SRC_URI[sha256sum] = "577c0aeae1eb3c754eacb9122d369d67609fef759bc6a4fa16cafeab4f30019b" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.16.1.bb index 07dc8d045d..c70abb0473 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.16.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.16.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "ed7057a101af1146f0554a769930ac9de506aeca4fd5af6543ebe791851a9fbd" +SRC_URI[sha256sum] = "5fd170986bce6bfd7bb5c845c4b8362edb1e0cba901e062196e83f8bb5d5d32c" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod/run-ptest new file mode 100644 index 0000000000..bf1244b07c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod/run-ptest @@ -0,0 +1,15 @@ +#!/bin/sh + +cd $(dirname "$(readlink -f "$0")") + +# python3-gpiod uses gpio-sim - a configfs-based testing module. We need to +# make sure configfs is mounted before running any tests. +modprobe configfs +mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config + +python3 -m gpiod-test -v > ./python3-gpiod.out 2>&1 +if [ $? -ne 0 ]; then + echo "FAIL: python3-gpiod" +else + echo "PASS: python3-gpiod" +fi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod_2.0-rc3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod_2.0-rc3.bb new file mode 100644 index 0000000000..6af1542bfd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod_2.0-rc3.bb @@ -0,0 +1,45 @@ +SUMMARY = "Python bindings for libgpiod." +AUTHOR = "Bartosz Golaszewski <brgl@bgdev.pl>" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" +LIC_FILES_CHKSUM = " \ + file://../../LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://../../LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://../../LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ +" + +require recipes-support/libgpiod/libgpiod-src.inc + +SRC_URI += "file://run-ptest" + +SRC_URI[sha256sum] = "1d1756d465525deb668526571dc6ed7e08f7b8e7745b10fc028208a22fb7adf8" +S = "${WORKDIR}/libgpiod-2.0/bindings/python" + +inherit setuptools3 ptest + +DEPENDS += "libgpiod" +RDEPENDS:${PN} += "libgpiod (>= 2.0)" +RDEPENDS:${PN}-ptest += "python3-setuptools" + +export GPIOD_WITH_TESTS = "${@bb.utils.contains("PTEST_ENABLED", "1", "1", "0", d)}" +PTEST_CFLAGS = "${@bb.utils.contains("PTEST_ENABLED", "1", "-I../../tests/gpiosim", "", d)}" +# Setuptools store full filesystem paths in DWARF files. Map them to './' to +# avoid QA warnings. +export CFLAGS = "${PTEST_CFLAGS} -fdebug-prefix-map=${B}=./" + +do_install:append() { + # Python setuptools have an issue where they install C extensions even if + # they're not in the list of packages to be packaged. This is how the test + # extensions end up being installed. Remove them here. + rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/tests/ +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/gpiod-test/gpiosim + install -d ${D}${PTEST_PATH}/gpiod-test/procname + install -m 0644 ${B}/tests/*.py ${D}${PTEST_PATH}/gpiod-test/ + install -m 0644 ${B}/build/lib*/tests/gpiosim/_ext* ${D}${PTEST_PATH}/gpiod-test/gpiosim + install -m 0644 ${B}/tests/gpiosim/*.py ${D}${PTEST_PATH}/gpiod-test/gpiosim + install -m 0644 ${B}/build/lib*/tests/procname/_ext* ${D}${PTEST_PATH}/gpiod-test/procname + install -m 0644 ${B}/tests/procname/*.py ${D}${PTEST_PATH}/gpiod-test/procname +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch new file mode 100644 index 0000000000..918c6c8601 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch @@ -0,0 +1,27 @@ +From 4432b9a296c9c287dfe281b4d464dfd03e4eb721 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 12 Feb 2023 21:25:04 -0800 +Subject: [PATCH] zlib: Include unistd.h for open/close C APIs + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + third_party/zlib/gzguts.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h +index 57faf37..3c700c2 100644 +--- a/third_party/zlib/gzguts.h ++++ b/third_party/zlib/gzguts.h +@@ -19,6 +19,7 @@ + #endif + + #include <stdio.h> ++#include <unistd.h> + #include "zlib.h" + #ifdef STDC + # include <string.h> +-- +2.39.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb index 3d45c56b0a..7a9b7d8018 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb @@ -12,6 +12,7 @@ SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ file://mips_bigendian.patch \ file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ + file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ " SRC_URI[sha256sum] = "e6dfc2b6567b1c261739b43d9c59d201c1b89e017afd9e684d85aa7a186c9f7a" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.5.bb index 2f433814ee..dbddd6cb80 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" PYPI_PACKAGE = "huey" -SRC_URI[sha256sum] = "6a27a7862a7a982c0508ad4e548d95765e3b0d97093a51106f07540837a09c86" +SRC_URI[sha256sum] = "760cf150deff1fa34b852da37701a5a750d1148f03ea07aa2b3764dc6060b4c3" RDEPENDS:${PN} += " \ python3-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch index 36485d56ce..7bb5ee58cc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch @@ -10,25 +10,25 @@ Also, don't use icu-config Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> - +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index d308b80..56e9c74 100644 +index 176c9ab..0a10268 100644 --- a/setup.py +++ b/setup.py -@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU major version supported: %s) +@@ -68,7 +68,7 @@ elif platform.startswith('freebsd'): CONFIGURE_WITH_ICU_CONFIG = { - 'darwin': True, + 'darwin': False, - 'linux': True, + 'linux': False, 'freebsd': False, # not tested 'win32': False, # no icu-config 'sunos5': False, # not tested -@@ -273,7 +273,6 @@ setup(name="PyICU", +@@ -277,7 +277,6 @@ setup(name="PyICU", ext_modules=[Extension('icu._icu_', [filename for filename in sorted(os.listdir(os.curdir)) if filename.endswith('.cpp')], @@ -36,3 +36,6 @@ index d308b80..56e9c74 100644 extra_compile_args=_cflags, extra_link_args=_lflags, libraries=_libraries)], +-- +2.34.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.10.2.bb index 027ef129ee..cbcc2f87b6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.10.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0724597863f1581ab01429e0423e779f" DEPENDS += "icu" PYPI_PACKAGE = "PyICU" -SRC_URI[sha256sum] = "f0b9549a87f87ba7c413f13679d137271e0b37f1f39b0109ace38257d4d148d6" +SRC_URI[sha256sum] = "0c3309eea7fab6857507ace62403515b60fe096cbfb4f90d14f55ff75c5441c1" SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.25.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.25.1.bb index 4edd166fde..9a9205c370 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.25.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.25.1.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "b80796a1f8c38c697a940a2ad7397ee28900d5c4e51061b9a67d16aca867f33e" +SRC_URI[sha256sum] = "6021d42debd2187e9c781e494a49a30eba002fbac1eef43f491bbc731e7a6d2b" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.10.0.bb index 5b3d85db04..d4b3012e4e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.10.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b" +SRC_URI[sha256sum] = "b13a1d6c1f5818bd388db53b7107d17454129a70de2b87481d555daede5eb49e" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.0.bb index eeb91723e3..5dfd02be4a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/nexB/license-expression" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "ad638292aa8493f84354909b517922cb823582c2ce2c4d880e42544a86bea8dd" +SRC_URI[sha256sum] = "943b1d2cde251bd30a166b509f78990fdd060be9750f3f1a324571e804857a53" inherit pypi ptest python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.11.0.bb index 4d34fbb01f..7ce3570b64 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.11.0.bb @@ -4,11 +4,11 @@ A small library to drive an OLED device with either SSD1306 , SSD1309, SSD1322, SSD1325, SSD1327, SSD1331, SSD1351 or SH1106 chipset" HOMEPAGE = "https://github.com/rm-hull/luma.oled" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=20adf60219f02398b350b8bfbdad7a58" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5ec447eb69733e20a55838de7e8cb991" inherit pypi setuptools3 -SRC_URI[sha256sum] = "e51c2ce5b88d591f9c64ab49d6bd5abd26759b87180706d615fec796569b6f6b" +SRC_URI[sha256sum] = "81583e77ecb1d3ae04a641b3311082719b7a3149c15a5f2577d9b93b243e9331" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch index 85423a3fec..0baadfcaa5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch @@ -5,7 +5,7 @@ Subject: [PATCH] setup.py: link in sysroot, not in host directories Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Upstream-Status: Unknown +Upstream-Status: Pending [Unknown] --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.1.bb index 447c86ddb7..a0a4b6dc99 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148 inherit pypi setuptools3 -SRC_URI[sha256sum] = "e47805627aebcf860edb4edf7987b1309c1b3632f3750538ed962bbcc3bd7449" +SRC_URI[sha256sum] = "f06d44e2c973781068bce5ecf860a09bcdb1c7f5ce1facd5e9aa82c92c93ae72" RDEPENDS:${PN} += "\ ${PYTHON_PN}-compression \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.5.3.bb index 15709b6047..aa8dfe279d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.5.3.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c1cc9ab35a8b2aabf933cd6d245b5db3" -SRC_URI[sha256sum] = "220b98d15cee0b2cd839a6358bd1f273d0356bf964c1a1aeb32d47db0215488b" +SRC_URI[sha256sum] = "74a3fd7e5a7ec052f183273dc7b0acd3a863edf7520f5d3a1765c04ffdb3b0b1" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.0.0.bb index 6295c66a27..9e79c36687 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/paramiko/paramiko/" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" -SRC_URI[sha256sum] = "376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49" +SRC_URI[sha256sum] = "fedc9b1dd43bc1d45f67f1ceca10bc336605427a46dcdf8dec6bfea3edf57965" PYPI_PACKAGE = "paramiko" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb index 9f1cc9eac5..86705d2d8e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb @@ -38,11 +38,13 @@ RDEPENDS:${PN}-ptest += " \ jpeg-tools \ libwebp \ ${PYTHON_PN}-core \ + ${PYTHON_PN}-distutils \ ${PYTHON_PN}-image \ ${PYTHON_PN}-mmap \ ${PYTHON_PN}-pytest \ ${PYTHON_PN}-pytest-timeout \ ${PYTHON_PN}-resource \ + ${PYTHON_PN}-unixadmin\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tk', '', d)} \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.3.1.bb index 1638d64c32..d998db01dd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.3.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" inherit pypi setuptools3 -SRC_URI[sha256sum] = "0e9d42838099263201b25517e4c1bd57042b5fe44432d6df38cef72d84d1eb1f" +SRC_URI[sha256sum] = "247471718131d41fb82137ab7b6466cdf4b785d047e38d309ebf34c84101a3a6" RDEPENDS:${PN} = "\ ${PYTHON_PN}-sortedcontainers \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.5.bb index c17f3024cd..77e94a9bb0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c02ea30650b91528657db64baea1757" inherit pypi setuptools3 -SRC_URI[sha256sum] = "b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648" +SRC_URI[sha256sum] = "9e337ac83686645a46db0e825acceea8e02fca4062483f40e9ae178e8bd1103a" RDEPENDS:${PN} += "\ ${PYTHON_PN}-typing-extensions \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch index c5cb9a8780..eb97f05850 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch @@ -16,7 +16,7 @@ def func(x, y, returned=None, error=None): proxy.Method(a, b, callback=func, callback_args=(x, y)) -Upstream-Status: Cherry-pick [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/] +Upstream-Status: Backport [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch index f5c0390c54..9c9b9b779b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch @@ -7,7 +7,7 @@ Subject: [PATCH 2/2] Support transformation between D-Bus errors and Exceptions can be registered with decorators, raised in a remote method and recreated after return from the remote call. -Upstream-Status: Cherry-pick [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/] +Upstream-Status: Backport [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.167.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.168.bb index b4680e35d3..2beff5c33d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.167.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.168.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main" -SRCREV = "29dc2d6d1aa7919f50db256525bf66aa52b585ec" +SRCREV = "9a7adb2e0d60d2edee9f541db808652875bae20e" S = "${WORKDIR}/git" inherit python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.1.3.bb index b58c62218a..3750f5781e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.1.3.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c2223d66c7e674b40527b5a4c35bd76" DEPENDS += "python3-six-native" -SRC_URI[sha256sum] = "eeba02c86b13b1f885c0acc50adf4611df24ab85066ff54daa37c2d883c32525" +SRC_URI[sha256sum] = "714e5d6b7e28c4016a94346e73033aff276b6ce8bd22e470ba4fd8b982e08a98" S = "${WORKDIR}/pymodbus-${PV}" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.4.bb index a19e38770a..980b6d965b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.4.bb @@ -9,7 +9,7 @@ LICENSE = "0BSD & MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=14a49c74a1d91829908ac756c07e6b91" DEPENDS += "python3-setuptools-scm-native" -SRC_URI[sha256sum] = "50cb1f910163204caec30c7c6bbe70f1a81c377538b8c8340d23abe31f5ca5b4" +SRC_URI[sha256sum] = "94088d129b61cd9b4b4607c6a466759b1bb2ada36206d5ac20aa319edcc5d701" inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "PyScaffold" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.6.0.bb index 2e6a32a248..f573bf0523 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.6.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pytest-dev/pytest-forked" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" -SRC_URI[sha256sum] = "8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e" +SRC_URI[sha256sum] = "4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_3.2.0.bb index 1651ec34ba..a3b28835c7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_3.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pytest-dev/pytest-xdist" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" -SRC_URI[sha256sum] = "40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c" +SRC_URI[sha256sum] = "fa10f95a2564cd91652f2d132725183c3b590d9fdcdec09d3677386ecf4c1ce9" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb index f6de60e1a9..8c0429bbb1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" PYPI_PACKAGE = "qrcode" -SRC_URI[sha256sum] = "375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578" +SRC_URI[sha256sum] = "9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.5.1.bb index 37c64b11ff..9b2698589c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.5.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1db1f331d351900707368237cc4880cf" -SRC_URI[sha256sum] = "a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7" +SRC_URI[sha256sum] = "1eec3741cda408d3a5f84b78d089c8b8d895f21b3b050988351e925faf202864" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.15.0.bb index 001ff6082c..b3ce17451c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.15.0.bb @@ -15,7 +15,7 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ " -SRC_URI[sha256sum] = "72da0766c3069a3941eadbdfa0996f83f5a33e55902a19ba399557cfee1dddcc" +SRC_URI[sha256sum] = "69ecbb2e1ff4db02a06c4f20f6f69cb5dfe3ebfbc06d023e40d77cf78e9c37e7" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch deleted file mode 100644 index b090755f8a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Submitted [https://github.com/danthedeckie/simpleeval/pull/119] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 08bc99211aec32882d5f1c83896eb5d72b9fb125 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Mon, 23 May 2022 11:35:00 +0100 -Subject: [PATCH] pyproject.toml: remove build as a build-dependency - -pypa/build is one possible build tool, but not the only build tool. Forcing build to be present as a build dependency is meaningless: either the user is using build so obviously have build, or are using something else so having build is irrelevant. ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 052a55a..416482b 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["setuptools>=30.3.0", "wheel", "build"] -+requires = ["setuptools>=30.3.0", "wheel"] - build-backend = "setuptools.build_meta" - - [tool.black] diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb index c9cf33d023..35cd19ffef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb @@ -3,16 +3,13 @@ HOMEPAGE = "https://pypi.org/project/simpleeval/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=dc9277482effe59b734b004cbcc1fee7" -SRC_URI[sha256sum] = "3e0be507486d4e21cf9d08847c7e57dd61a1603950399985f7c5a0be7fd33e36" +SRC_URI[sha256sum] = "4a30f9cc01825fe4c719c785e3762623e350c4840d5e6855c2a8496baaa65fac" inherit pypi python_setuptools_build_meta ptest BBCLASSEXTEND = "native nativesdk" -SRC_URI += " \ - file://no-build.patch \ - file://run-ptest \ -" +SRC_URI += "file://run-ptest" RDEPENDS:${PN} += " \ ${PYTHON_PN}-math \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.18.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.18.3.bb index 1aaa1eab02..5752a03443 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.18.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.18.3.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" -SRC_URI[sha256sum] = "746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa" +SRC_URI[sha256sum] = "ebb53837c5ffcb6100646018565d3f1afed6f4b185b14b2c9cbccf874fe40157" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.3.2.post1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.4.bb index 99b6f7c04b..ba5fe505d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.3.2.post1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/facelessuser/soupsieve" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c7a2acf04248c0d02dac4c82ee8a7f56" -SRC_URI[sha256sum] = "fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d" +SRC_URI[sha256sum] = "e28dba9ca6c7c00173e34e4ba57448f0688bb681b7c5e8bf4971daafc093d69a" inherit pypi python_hatchling python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.46.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.4.bb index be9c5b7bd2..e5d0212a61 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.46.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b707d50badb798e1d897f2c8f649382d" -SRC_URI[sha256sum] = "6913b8247d8a292ef8315162a51931e2b40ce91681f1b6f18f697045200c4a30" +SRC_URI[sha256sum] = "95a18e1a6af2114dbd9ee4f168ad33070d6317e11bafa28d983cc7b585fe900b" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_5.0.0.bb index 66916838c4..6b40b6c3fb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_4.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_5.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "7f8aeb6e3f90f96832c301bff21a7eb5eefbe894c88c506483d355565d88cc1a" +SRC_URI[sha256sum] = "2c428d2338976279e8eb2196f7a94910960d9f7ba2f41f3988511e95ca447021" DEPENDS += "${PYTHON_PN}-pbr-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch index d7085a8565..d7085a8565 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_235.bb index 10614fe374..01d42cd5a4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_235.bb @@ -4,20 +4,9 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" PYPI_PACKAGE = "systemd-python" -DEPENDS += "systemd (<=234)" +DEPENDS += "systemd (<=235)" RDEPENDS:${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging python3-syslog" REQUIRED_DISTRO_FEATURES = "systemd" inherit pypi features_check pkgconfig setuptools3 - -SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d" -SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7" - -# allow for common patches for python- and python3-systemd -FILESEXTRAPATHS:prepend := "${THISDIR}/python-systemd:" - -SRC_URI += " \ - file://endian.patch \ - file://0002-setup.py-switch-from-distutils-to-setuptools.patch \ -" - SRC_URI:append:libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" +SRC_URI[sha256sum] = "4e57f39797fd5d9e2d22b8806a252d7c0106c936039d1e71c8c6b8008e695c0a" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb index 3f75df6f19..ee4ac64c3b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb @@ -4,7 +4,7 @@ AUTHOR = "IPython Development Team <ipython-dev@scipy.org>" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.md;md5=f17a3ba4cd59794dd6e005c8e150aef0" -SRC_URI[sha256sum] = "32500888f5ff7bbf3b9267ea31748fa657aaf34d56d85e60f91dda7dc7f5785b" +SRC_URI[sha256sum] = "f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.3.0.bb index b76c6de0ed..8b4cdbb3ea 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.3.0.bb @@ -4,7 +4,7 @@ DEPENDS = "${PYTHON_PN}-argh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f" +SRC_URI[sha256sum] = "9d39effe6909be898ba3e7286a9e9b17a6a9f734fb1ef9dde3e9bb68715fca39" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.5.1.bb index ab88af4bf5..41d469cf1d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.5.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/websocket-client/websocket-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b969e9612325987c823fc0737063ebc8" -SRC_URI[sha256sum] = "d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59" +SRC_URI[sha256sum] = "3f09e6d8230892547132177f575a4e3e73cfdf06526e20cc02aa1c3b47184d40" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.2.3.bb index 92302f9cd7..5565fb4ead 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.2.3.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" PYPI_PACKAGE = "Werkzeug" -SRC_URI[sha256sum] = "7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f" +SRC_URI[sha256sum] = "2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.8.bb index e73e579e37..4b89ba68df 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.8.bb @@ -16,6 +16,6 @@ RDEPENDS:${PN} += " \ python3-io \ " -SRC_URI[sha256sum] = "1239958b12da12be6abf05b32f64ff162eb75fff0fdf00d901ca0f46dc0557cf" +SRC_URI[sha256sum] = "ec77335fb118c36bc5ed1c89e33904d649e4989df2d7980f7d6a9dd95ee5874e" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_2.2.1.bb index ff7e9696d4..f643a140f2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_2.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_2.2.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ab20f8e337bea2e6874f372edfd12c0" -SRC_URI[sha256sum] = "5ca34ff15dd3276cfb2e3e7b4c8dde4b7d4d27080f333a93b6c3f817e90abddf" +SRC_URI[sha256sum] = "035939104bacd0ccefcd591220cce90d160d71f17189ee332a011c3fd05c086d" PYPI_PACKAGE = "xmlschema" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.47.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.47.3.bb index 0c0304aa2b..b1dec03b04 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.47.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.47.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3" -SRC_URI[sha256sum] = "65ab91068f8fafe00856b63756c72296b69682709681e96e8bb5d101345d5011" +SRC_URI[sha256sum] = "eb6ad7fdf3ef542c99416c4a5de60c6a4d16d82b336522e0ef6e7d2d2ddca603" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.7.0.bb index 51651f3bcf..b6c40921c3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_1.7.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/tomerfiliba/reedsolomon" LICENSE = "MIT-0 | Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=ffde61aeb8917e70e0257e0a4b6d103c" -SRC_URI[sha256sum] = "a7ce6b0efad8df491a70b87b6ab3543e751f7700dc4ac0b12081a456ef634f5d" +SRC_URI[sha256sum] = "c1359f02742751afe0f1c0de9f0772cc113835aa2855d2db420ea24393c87732" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson/0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson/0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch new file mode 100644 index 0000000000..dc3f8657ec --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson/0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch @@ -0,0 +1,40 @@ +From 0d0ffab004306b1379f247016200ade381d1d181 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 8 Feb 2023 23:03:47 -0800 +Subject: [PATCH] setup.py: Do not poke at git describe to find version + +OE uses git snapshot and git describe --tags will emit a string which is +not PEP440 compliant version scheme. setuptools 67+ is strict about it +and fails to build. Therefore inject a static version.py from OE +environment and use that for version number based on PV + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setup.py | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/setup.py b/setup.py +index a77138f..df675cd 100644 +--- a/setup.py ++++ b/setup.py +@@ -28,14 +28,8 @@ def main(): + # Also, when git is not available (PyPi package), use stored version.py. + version_py = os.path.join(os.path.dirname(__file__), 'version.py') + +- try: +- if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2): +- version_git = subprocess.Popen(['ls', '-l'], stdout=subprocess.PIPE).communicate()[0] +- else: +- version_git = subprocess.check_output(["git", "describe", "--tags"]).rstrip() +- except: +- with open(version_py, 'r') as fh: +- version_git = open(version_py).read().strip().split('=')[-1].replace('"','') ++ with open(version_py, 'r') as fh: ++ version_git = open(version_py).read().strip().split('=')[-1].replace('"','') + + version_msg = "# Do not edit this file, pipeline versioning is governed by git tags" + with open(version_py, 'w') as fh: +-- +2.39.1 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb index c4fcc61ec0..f9b4b64a50 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb @@ -7,8 +7,10 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=7709d2635e63ab96973055a23c2a4cac" -SRCREV = "f3f2898c44bb16b951d3e9f2fbf6d1c4158edda2" -SRC_URI = "git://github.com/gt3389b/python-cson.git;branch=master;protocol=https" +PV = "1.0.9+1.0.10" +SRCREV = "69090778bccc5ed124342ba288597fbb2bfa9f39" +SRC_URI = "git://github.com/gt3389b/python-cson.git;branch=master;protocol=https \ + file://0001-setup.py-Do-not-poke-at-git-describe-to-find-version.patch" S = "${WORKDIR}/git" @@ -19,5 +21,9 @@ inherit setuptools3 PIP_INSTALL_PACKAGE = "python_cson" +do_configure:prepend() { + echo "__version__=${PV}" > ${S}/version.py +} + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch deleted file mode 100644 index 2eb6be5a18..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 034ac41561409ffc7836683331b6b94a641436e4 Mon Sep 17 00:00:00 2001 -From: Tim Orling <tim.orling@konsulko.com> -Date: Mon, 28 Feb 2022 09:41:02 -0800 -Subject: [PATCH] setup.py: switch from distutils to setuptools - -In Python 3.10 'distutils' is deprecated with removal slated for Python -3.12. Switch from 'distutils.core' to 'setuptools'. - -This also allows for a 'wheel' binary archive format to be built with -'setup.py bdist_wheel'. - -Upstream-Status: Backport [cf9eafdd165347f86bb4a2534c41fd805db52322] - -Signed-off-by: Tim Orling <tim.orling@konsulko.com> - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 9c12180..3ba5195 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,6 +1,6 @@ - #!/usr/bin/python3 - --from distutils.core import setup -+from setuptools import setup - - setup(name='python-meh', version='0.50.1', - description='Python module for handling exceptions', diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb index 1d9af438da..e83514af1b 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb @@ -9,9 +9,8 @@ inherit setuptools3_legacy S = "${WORKDIR}/git" -SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=rhel9-branch \ - file://0001-setup.py-switch-from-distutils-to-setuptools.patch \ - " -SRCREV = "c321ce22950aff76611a3c6beffa02b5ea3adbed" +SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master" + +SRCREV = "eb5d4adc3b838704b6a68f0f77ada2063a11ab1b" FILES:${PN} += "${datadir}/python-meh" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch index 5f95d74bf1..309a00122a 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch @@ -9,18 +9,17 @@ we support basic/digest authentication. Add KickstartAuthError to report authentication failure, which the invoker could parse this specific error. -Upstream-Status: inappropriate [oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - --- pykickstart/errors.py | 17 +++++++++++++++++ - pykickstart/load.py | 34 ++++++++++++++++++++++++++++------ + pykickstart/load.py | 32 +++++++++++++++++++++++++++----- pykickstart/parser.py | 4 ++-- - 3 files changed, 47 insertions(+), 8 deletions(-) + 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/pykickstart/errors.py b/pykickstart/errors.py -index 8294f59a..3d20bf82 100644 +index 8294f59..3d20bf8 100644 --- a/pykickstart/errors.py +++ b/pykickstart/errors.py @@ -32,6 +32,9 @@ This module exports several exception classes: @@ -52,16 +51,15 @@ index 8294f59a..3d20bf82 100644 + def __str__(self): + return self.value diff --git a/pykickstart/load.py b/pykickstart/load.py -index 30e2fcfa..b984876d 100644 +index eb76b65..f51cf08 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -18,9 +18,12 @@ +@@ -18,9 +18,11 @@ # with the express permission of Red Hat, Inc. # import requests +from requests.auth import HTTPDigestAuth +from requests.auth import HTTPBasicAuth -+ import shutil -from pykickstart.errors import KickstartError @@ -69,7 +67,7 @@ index 30e2fcfa..b984876d 100644 from pykickstart.i18n import _ from requests.exceptions import SSLError, RequestException -@@ -28,7 +31,7 @@ _is_url = lambda location: '://' in location # RFC 3986 +@@ -28,7 +30,7 @@ is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = True @@ -78,21 +76,20 @@ index 30e2fcfa..b984876d 100644 '''Load a destination URL or file into a string. Type of input is inferred automatically. -@@ -39,7 +42,7 @@ def load_to_str(location): +@@ -39,7 +41,7 @@ def load_to_str(location): Raises: KickstartError on error reading''' - if _is_url(location): + if is_url(location): - return _load_url(location) + return _load_url(location, user=user, passwd=passwd) else: return _load_file(location) -@@ -69,11 +72,30 @@ def load_to_file(location, destination): +@@ -69,11 +71,31 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination -def _load_url(location): -- '''Load a location (URL or filename) and return contents as string''' +def _get_auth(location, user=None, passwd=None): + + auth = None @@ -101,7 +98,7 @@ index 30e2fcfa..b984876d 100644 + if user is None or passwd is None: + log.info("Require Authentication") + raise KickstartAuthError("Require Authentication.\nAppend 'ksuser=<username> kspasswd=<password>' to boot command") - ++ + reasons = request.headers.get("WWW-Authenticate", "").split() + if reasons: + auth_type = reasons[0] @@ -113,8 +110,9 @@ index 30e2fcfa..b984876d 100644 + return auth + +def _load_url(location, user=None, passwd=None): -+ '''Load a location (URL or filename) and return contents as string''' + '''Load a location (URL or filename) and return contents as string''' + auth = _get_auth(location, user=user, passwd=passwd) + try: - request = requests.get(location, verify=SSL_VERIFY) + request = requests.get(location, verify=SSL_VERIFY, auth=auth) @@ -122,10 +120,10 @@ index 30e2fcfa..b984876d 100644 raise KickstartError(_('Error securely accessing URL "%s"') % location + ': {e}'.format(e=str(e))) except RequestException as e: diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index b23e54f1..e10f06b5 100644 +index 7edf8aa..46c5299 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -796,7 +796,7 @@ class KickstartParser(object): +@@ -790,7 +790,7 @@ class KickstartParser(object): i = PutBackIterator(s.splitlines(True) + [""]) self._stateMachine(i) @@ -134,7 +132,7 @@ index b23e54f1..e10f06b5 100644 """Process a kickstart file, given by the filename f.""" if reset: self._reset() -@@ -817,7 +817,7 @@ class KickstartParser(object): +@@ -811,7 +811,7 @@ class KickstartParser(object): self.currentdir[self._includeDepth] = cd try: @@ -143,3 +141,6 @@ index b23e54f1..e10f06b5 100644 except KickstartError as e: raise KickstartError(_("Unable to open input kickstart file: %s") % str(e), lineno=0) +-- +2.34.1 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch index 4a001f3386..5e0d6166fa 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch @@ -1,7 +1,7 @@ From 62fdead139edb0f29b2f222efcb8f39be15b057e Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 30 Jul 2018 15:47:13 +0800 -Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and +Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and support https without certification - Add lock for readKickstart to fix race issue @@ -9,18 +9,19 @@ Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and - Support to download kickstart file through https without certification Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- pykickstart/load.py | 2 +- pykickstart/parser.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pykickstart/load.py b/pykickstart/load.py -index c6f013f..7adb751 100644 +index 8da8051..e856c8d 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -30,7 +30,7 @@ from requests.exceptions import SSLError, RequestException +@@ -32,7 +32,7 @@ log = logging.getLogger("anaconda.main") - _is_url = lambda location: '://' in location # RFC 3986 + is_url = lambda location: '://' in location # RFC 3986 -SSL_VERIFY = True +SSL_VERIFY = False @@ -28,10 +29,10 @@ index c6f013f..7adb751 100644 def load_to_str(location, user=None, passwd=None): '''Load a destination URL or file into a string. diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index e44099b..e68174d 100644 +index b95ba90..a55a9a3 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -55,6 +55,20 @@ from pykickstart.i18n import _ +@@ -51,6 +51,20 @@ from pykickstart.i18n import _ STATE_END = "end" STATE_COMMANDS = "commands" @@ -52,7 +53,7 @@ index e44099b..e68174d 100644 def _preprocessStateMachine(lineIter): l = None lineno = 0 -@@ -788,6 +802,10 @@ class KickstartParser(object): +@@ -791,6 +805,10 @@ class KickstartParser(object): self._stateMachine(i) def readKickstart(self, f, reset=True, username=None, password=None): @@ -64,5 +65,5 @@ index e44099b..e68174d 100644 if reset: self._reset() -- -2.7.4 +2.34.1 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch index 7ab7346860..6242e23b9c 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch @@ -6,7 +6,7 @@ Subject: [PATCH 3/4] comment out sections shutdown and environment in Both of them is disabled by default. -Upstream-Status: Inappropriate[oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch index bf5a197230..abe2c87e00 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch @@ -8,22 +8,21 @@ network, it failed and wait 300s to break, we should retry to invoke request with timeout explicitly. So if it the network is up, the fetch works. -Upstream-Status: inappropriate [oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - --- pykickstart/load.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pykickstart/load.py b/pykickstart/load.py -index f75fe5d3..a8f3ed1d 100644 +index 58faba6..e856c8d 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -21,12 +21,16 @@ import requests +@@ -20,12 +20,16 @@ + import requests from requests.auth import HTTPDigestAuth from requests.auth import HTTPBasicAuth - +import time import shutil @@ -34,10 +33,10 @@ index f75fe5d3..a8f3ed1d 100644 +import logging +log = logging.getLogger("anaconda.main") + - _is_url = lambda location: '://' in location # RFC 3986 + is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = False -@@ -72,6 +76,29 @@ def load_to_file(location, destination): +@@ -71,6 +75,29 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination @@ -67,7 +66,7 @@ index f75fe5d3..a8f3ed1d 100644 def _get_auth(location, user=None, passwd=None): auth = None -@@ -93,6 +120,10 @@ def _get_auth(location, user=None, passwd=None): +@@ -92,6 +119,10 @@ def _get_auth(location, user=None, passwd=None): def _load_url(location, user=None, passwd=None): '''Load a location (URL or filename) and return contents as string''' @@ -76,5 +75,8 @@ index f75fe5d3..a8f3ed1d 100644 + raise KickstartError(_("Connection %s failed" % location)) + auth = _get_auth(location, user=user, passwd=passwd) + try: - request = requests.get(location, verify=SSL_VERIFY, auth=auth) +-- +2.34.1 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.44.bb index 6bf9ada581..632662c28c 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.44.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ " -SRCREV = "bfd836cfdd8439d984595aca015811ed5c6be733" +SRCREV = "6f29ffdb6ed8330ddd21c026576d9fb23dd31c0f" UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" diff --git a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.6.0.bb b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.7.0.bb index 1762ae3a5e..03c4f2f40e 100644 --- a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.6.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.7.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=152634da660a374ca18c0734ed07c63c" -SRC_URI[sha256sum] = "964f6830fb42a74b5d32bce99ed37d8308c1d7d44ddf18f3dd89f4680de97b39" +SRC_URI[sha256sum] = "032e81d534a88ec1736d03f780ba073f047a06c478b06e2937486f334e955c51" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.5.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.0.bb index d109fa4601..cbf2a7a337 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.5.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.0.bb @@ -16,7 +16,7 @@ HOMEPAGE = "http://pywbem.github.io" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[sha256sum] = "c5f7e458c2530c61358fbc6333be74faf366aace78eae33741431267adf32610" +SRC_URI[sha256sum] = "e26ab0324475ee5329d74971f942b4b315b6ac0edaf278e70e16b5603278ef98" inherit pypi setuptools3 update-alternatives |