diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 670361598ec..9626231bba9 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -189,6 +189,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-intelhex \ python3-intervals \ python3-ipaddress \ + python3-ipy \ python3-ipython \ python3-ipython-genutils \ python3-iso3166 \ @@ -498,6 +499,7 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\ python3-html2text-ptest \ python3-inflection-ptest \ python3-intervals-ptest \ + python3-ipy-ptest \ python3-iso3166-ptest \ python3-jdcal-ptest \ python3-jinja2-ptest \ diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb new file mode 100644 index 00000000000..2bf9192481b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features" +HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec941a1cd6616454970d03cb9c9e8f8" + +SRC_URI[sha256sum] = "867cc056d88fc07aa8b3d1dc5b9c3c911cdd6130a4df5f67beb1fdecfd37b164" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-core \ + python3-ctypes \ + python3-io \ +" diff --git a/meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb b/meta-python/recipes-devtools/python/python3-autobahn_22.2.2.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb rename to meta-python/recipes-devtools/python/python3-autobahn_22.2.2.bb index f149b1221ef..c63770564cc 100644 --- a/meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-autobahn_22.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://crossbar.io/autobahn" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" -SRC_URI[sha256sum] = "17e1b58b6ae1a63ca7d926b1d71bb9e4fd6b9ac9a1a2277d8ee40e0b61f54746" +SRC_URI[sha256sum] = "60e1f4c602aacd052ffe3d46ae40b6b75f8286b3c46922c213b523162e58c17e" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post1.bb b/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb similarity index 80% rename from meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post1.bb rename to meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb index 448772960be..8eed99ee306 100644 --- a/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post1.bb +++ b/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb @@ -11,4 +11,4 @@ RDEPENDS:${PN}:class-native = "" BBCLASSEXTEND = "native nativesdk" -SRC_URI[sha256sum] = "58b5d84e5fbff6cf8e117414b3ea49ef51654c02ee887d155113c5b91d761967" +SRC_URI[sha256sum] = "63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878" diff --git a/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb b/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb index f58760761a0..4f6a3aba998 100644 --- a/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb +++ b/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb @@ -13,4 +13,10 @@ SRC_URI[sha256sum] = "3d058e7a5e37e4985d1a7ad4cb702bca56b490daa658d4851377d13ead inherit pypi setuptools3 +do_compile:prepend() { + if ! grep 'platform =' setup.cfg; then + printf "[build_ext]\nplatform = ${TARGET_ARCH}" >> setup.cfg + fi +} + RDEPENDS:${PN} += "python3-core" diff --git a/meta-python/recipes-devtools/python/python3-django_2.2.26.bb b/meta-python/recipes-devtools/python/python3-django_2.2.27.bb similarity index 71% rename from meta-python/recipes-devtools/python/python3-django_2.2.26.bb rename to meta-python/recipes-devtools/python/python3-django_2.2.27.bb index 523f0e0912f..786afab2483 100644 --- a/meta-python/recipes-devtools/python/python3-django_2.2.26.bb +++ b/meta-python/recipes-devtools/python/python3-django_2.2.27.bb @@ -5,7 +5,7 @@ UPSTREAM_CHECK_REGEX = "/${PYPI_PACKAGE}/(?P(2\.2\.\d*)+)/" inherit setuptools3 -SRC_URI[sha256sum] = "dfa537267d52c6243a62b32855a744ca83c37c70600aacffbfd98bc5d6d8518f" +SRC_URI[sha256sum] = "1ee37046b0bf2b61e83b3a01d067323516ec3b6f2b17cd49b1326dd4ba9dc913" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ diff --git a/meta-python/recipes-devtools/python/python3-httplib2_0.20.2.bb b/meta-python/recipes-devtools/python/python3-httplib2_0.20.4.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-httplib2_0.20.2.bb rename to meta-python/recipes-devtools/python/python3-httplib2_0.20.4.bb index bda1d1f0bc7..6d22286caf2 100644 --- a/meta-python/recipes-devtools/python/python3-httplib2_0.20.2.bb +++ b/meta-python/recipes-devtools/python/python3-httplib2_0.20.4.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf" -SRC_URI[sha256sum] = "e404681d2fbcec7506bcb52c503f2b021e95bee0ef7d01e5c221468a2406d8dc" +SRC_URI[sha256sum] = "58a98e45b4b1a48273073f905d2961666ecf0fbac4250ea5b47aef259eb5c585" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch b/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch index c45217a88a3..36485d56ced 100644 --- a/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch +++ b/meta-python/recipes-devtools/python/python3-icu/0001-Fix-host-contamination-of-include-files.patch @@ -1,4 +1,4 @@ -From 8abf79f77d9151d6786da3c8e868117822bce6d4 Mon Sep 17 00:00:00 2001 +From a82fea9663f0c70cf57cd06650f400e878afc5e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 16 Apr 2021 10:48:36 -0700 Subject: [PATCH] Fix host contamination of include files @@ -10,12 +10,13 @@ Also, don't use icu-config Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster Signed-off-by: Khem Raj + --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index e647db4..abed399 100644 +index d308b80..56e9c74 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU major version supported: %s) @@ -27,14 +28,11 @@ index e647db4..abed399 100644 'freebsd': False, # not tested 'win32': False, # no icu-config 'sunos5': False, # not tested -@@ -267,7 +267,6 @@ setup(name="PyICU", - ext_modules=[Extension('_icu', +@@ -273,7 +273,6 @@ setup(name="PyICU", + ext_modules=[Extension('icu._icu_', [filename for filename in sorted(os.listdir(os.curdir)) if filename.endswith('.cpp')], - include_dirs=_includes, extra_compile_args=_cflags, extra_link_args=_lflags, libraries=_libraries)], --- -2.31.1 - diff --git a/meta-python/recipes-devtools/python/python3-icu_2.8.bb b/meta-python/recipes-devtools/python/python3-icu_2.8.1.bb similarity index 68% rename from meta-python/recipes-devtools/python/python3-icu_2.8.bb rename to meta-python/recipes-devtools/python/python3-icu_2.8.1.bb index f3dd7a4f522..09543d753d1 100644 --- a/meta-python/recipes-devtools/python/python3-icu_2.8.bb +++ b/meta-python/recipes-devtools/python/python3-icu_2.8.1.bb @@ -3,12 +3,12 @@ HOMEPAGE = "https://gitlab.pyicu.org/main/pyicu" BUGTRACKER = "https://gitlab.pyicu.org/main/pyicu/-/issues" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7c4bfd81a21e3b6368bdcced992bf59" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0724597863f1581ab01429e0423e779f" DEPENDS += "icu" PYPI_PACKAGE = "PyICU" -SRC_URI[sha256sum] = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9" +SRC_URI[sha256sum] = "f0b9549a87f87ba7c413f13679d137271e0b37f1f39b0109ace38257d4d148d6" SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" diff --git a/meta-python/recipes-devtools/python/python3-ipy/run-ptest b/meta-python/recipes-devtools/python/python3-ipy/run-ptest new file mode 100644 index 00000000000..b63c4de0d9a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ipy/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-python/recipes-devtools/python/python3-ipy_1.01.bb b/meta-python/recipes-devtools/python/python3-ipy_1.01.bb new file mode 100644 index 00000000000..8e7b5b987eb --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ipy_1.01.bb @@ -0,0 +1,32 @@ +SUMMARY = "IPy - class and tools for handling of IPv4 and IPv6 addresses and networks" +DESCRIPTION = "IPy is a Python module for handling IPv4 and IPv6 Addresses and Networks \ +in a fashion similar to perl's Net::IP and friends. The IP class allows \ +a comfortable parsing and handling for most notations in use for IPv4 \ +and IPv6 Addresses and Networks." +SECTION = "devel/python" +HOMEPAGE = "https://github.com/autocracy/python-ipy" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=848d24919845901b4f48bae5f13252e6" + +SRC_URI[md5sum] = "d6cf83e7f418ebbd23324ba1c658b907" +SRC_URI[sha256sum] = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a" + +inherit pypi setuptools3_legacy ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test/ + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test +} + +PYPI_PACKAGE = "IPy" + +BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.3.bb b/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.6.bb similarity index 83% rename from meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.3.bb rename to meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.6.bb index c2500300f1f..cdd93516ced 100644 --- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bcb/jsonrpcserver" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=61b63ea9d36f6fb63ddaaaac8265304f" -SRC_URI[sha256sum] = "0cc514559596fa380bf188e31b0cdf3d9e6d9cc162fdca8a49ed511b291a9ae1" +SRC_URI[sha256sum] = "0fdd69c15e67004fb064d2254469cf82d02b7bc8a7bf7760055caa9d62d92f7c" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch b/meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch deleted file mode 100644 index 7d9121846f3..00000000000 --- a/meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 057872fa40e061100d61117cee5c3413ef2e40fc Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 20 Jan 2022 15:18:20 +0800 -Subject: [PATCH] setupinfo.py: check the return value - -Use the return value altogether to check the subprocess execute -successfully or not as in some case it will print some noise -message though run successfully as below. - - # python - Python 3.8.10 (default, Nov 26 2021, 20:14:08) - [GCC 9.3.0] on linux - Type "help", "copyright", "credits" or "license" for more information. - >>> import subprocess - >>> cmd = "pkg-config --modversion libxml-2.0" - >>> p = subprocess.Popen(cmd, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE) - >>> stdout_data, errors = p.communicate() - >>> print(stdout_data) - b'2.9.12\n' - >>> print(errors) - b'do_ypcall: clnt_call: RPC: Unable to send; errno = Network is unreachable\n' - >>> - -Upstream-Status: Submitted [https://github.com/lxml/lxml/pull/336] - -Signed-off-by: Mingli Yu ---- - setupinfo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setupinfo.py b/setupinfo.py -index 8c2a36fb..c1247c6d 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -365,7 +365,7 @@ def run_command(cmd, *args): - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout_data, errors = p.communicate() - -- if errors: -+ if p.returncode != 0 and errors: - return '' - return decode_input(stdout_data).strip() - --- -2.17.1 - diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb b/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb similarity index 91% rename from meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb rename to meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb index f3b7e0c6cdf..c4d4df383a9 100644 --- a/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb @@ -18,11 +18,9 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ DEPENDS += "libxml2 libxslt" -SRC_URI[sha256sum] = "a1613838aa6b89af4ba10a0f3a972836128801ed008078f8c1244e65958f1b24" +SRC_URI[sha256sum] = "f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23" -SRC_URI += " \ - file://0001-setupinfo.py-check-the-return-value.patch \ -" +SRC_URI += "${PYPI_SRC_URI}" inherit pkgconfig pypi setuptools3 # {standard input}: Assembler messages: diff --git a/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb b/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb index 8ac9ed2be32..99ec763c4d5 100644 --- a/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb @@ -21,7 +21,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=104d5c3c653aeededf4076773aa4c236 \ SRC_URI[sha256sum] = "951fc7c1f8d710a94cb49019ee3742125039fc659675912ea614ac2aa405b118" -inherit pip_install_wheel python3native python3-dir pypi setuptools3-base +inherit poetry_core pypi + PIP_INSTALL_PACKAGE = "poetry_core" RDEPENDS:${PN}:append:class-target = "\ @@ -42,16 +43,4 @@ RDEPENDS:${PN} += "\ python3-six \ " -do_configure () { - mkdir -p ${B}/dist - cat > ${B}/build-it.py << EOF -from poetry.core.masonry import api -api.build_wheel('${B}/dist') -EOF -} - -do_compile () { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${B}/build-it.py -} - BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb b/meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb new file mode 100644 index 00000000000..b628cadafe4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "A fully featured modbus protocol stack in python" +HOMEPAGE = "https://github.com/riptideio/pymodbus/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c2223d66c7e674b40527b5a4c35bd76" +DEPENDS += "python3-six-native" + +SRC_URI[sha256sum] = "5ef68c1a109bdb467c830ef003ef2db6494349a5248e4af946fe21c9eefe7e74" +S = "${WORKDIR}/pymodbus-${PV}" + +inherit pypi setuptools3 + +PACKAGECONFIG ??= "" +PACKAGECONFIG[repl] = ",,,python3-aiohttp python3-click python3-prompt-toolkit python3-pygments python3-pyserial-asyncio" +PACKAGECONFIG[tornado] = ",,,python3-tornado" +PACKAGECONFIG[twisted] = ",,,python3-twisted-conch" +PACKAGECONFIG[redis] = ",,,python3-redis" +PACKAGECONFIG[sql] = ",,,python3-sqlalchemy" + +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-core \ + python3-io \ + python3-json \ + python3-logging \ + python3-math \ + python3-netserver \ +" + +RDEPENDS:${PN} += " \ + python3-pyserial \ + python3-six \ +" + + diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-linux.rs-Define-consts-for-rv32-architecture.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-linux.rs-Define-consts-for-rv32-architecture.patch new file mode 100644 index 00000000000..a2d4091a950 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-linux.rs-Define-consts-for-rv32-architecture.patch @@ -0,0 +1,26 @@ +From 3a3bd8475f93d54cb5bb62d239247fef2e03a733 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 5 Mar 2022 00:37:01 -0800 +Subject: [PATCH] linux.rs: Define consts for rv32 architecture + +Upstream-Status: Submitted [https://github.com/nix-rust/nix/pull/1669] +Signed-off-by: Khem Raj +--- + src/sys/ioctl/linux.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sys/ioctl/linux.rs b/src/sys/ioctl/linux.rs +index 68ebaba..08cd0c3 100644 +--- a/src/sys/ioctl/linux.rs ++++ b/src/sys/ioctl/linux.rs +@@ -34,6 +34,7 @@ mod consts { + target_arch = "s390x", + target_arch = "x86_64", + target_arch = "aarch64", ++ target_arch = "riscv32", + target_arch = "riscv64"))] + mod consts { + #[doc(hidden)] +-- +2.35.1 + diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv32-Define-O_LARGEFILE.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv32-Define-O_LARGEFILE.patch new file mode 100644 index 00000000000..0ecb50478e8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv32-Define-O_LARGEFILE.patch @@ -0,0 +1,29 @@ +From 8c1251b57827c7e757079d6e9304570643e8e80a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 5 Mar 2022 22:18:49 -0800 +Subject: [PATCH] riscv32: Define O_LARGEFILE + +Some applications (e.g. nix) use this define and expect it to come from libc + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2710] +Signed-off-by: Khem Raj +--- + src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs +index 4d551eb..feaa00a 100644 +--- a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs ++++ b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs +@@ -490,6 +490,8 @@ pub const FIONREAD: ::c_ulong = 21531; + pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40; + pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56; + ++pub const O_LARGEFILE: ::c_int = 0; ++ + pub const SYS_read: ::c_long = 63; + pub const SYS_write: ::c_long = 64; + pub const SYS_close: ::c_long = 57; +-- +2.35.1 + diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch index 67108472ac3..6143342178e 100644 --- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch @@ -1,21 +1,21 @@ -From c711fb215de54f960a35cdc48cd506b6b5db4918 Mon Sep 17 00:00:00 2001 +From a6f5bb3e7fe51733144497a3b5962b300f922a2d Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 26 Jan 2022 11:50:58 -0800 +Date: Mon, 7 Mar 2022 11:02:46 -0800 Subject: [PATCH] riscv64/mod.rs: Add missing error codes These are flagged by apps e.g. python3-pyruvate -Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2656] +Upstream-Status: Backport [https://github.com/rust-lang/libc/commit/c711fb215de54f960a35cdc48cd506b6b5db4918] Signed-off-by: Khem Raj --- src/unix/linux_like/linux/musl/b64/riscv64/mod.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs -index b075b4a05..6b17621c7 100644 +index 48fee4e..7c88abe 100644 --- a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs -@@ -548,6 +548,11 @@ pub const EHOSTUNREACH: ::c_int = 113; +@@ -551,6 +551,11 @@ pub const EHOSTUNREACH: ::c_int = 113; pub const EALREADY: ::c_int = 114; pub const EINPROGRESS: ::c_int = 115; pub const ESTALE: ::c_int = 116; @@ -28,5 +28,5 @@ index b075b4a05..6b17621c7 100644 pub const ENOMEDIUM: ::c_int = 123; pub const EMEDIUMTYPE: ::c_int = 124; -- -2.35.0 +2.35.1 diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-statfs-Exclude-riscv32.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-statfs-Exclude-riscv32.patch new file mode 100644 index 00000000000..b482d7c0db3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-statfs-Exclude-riscv32.patch @@ -0,0 +1,108 @@ +From ccdc974dc10c83e29d551492fb2d17a2ff8c2b84 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 5 Mar 2022 22:30:15 -0800 +Subject: [PATCH] statfs: Exclude riscv32 + +Upstream-Status: Submitted [https://github.com/nix-rust/nix/pull/1669] +Signed-off-by: Khem Raj +--- + src/sys/statfs.rs | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/sys/statfs.rs b/src/sys/statfs.rs +index 829be57..6b88dad 100644 +--- a/src/sys/statfs.rs ++++ b/src/sys/statfs.rs +@@ -292,7 +292,7 @@ impl Statfs { + } + + /// Total data blocks in filesystem +- #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))] ++ #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))] + pub fn blocks(&self) -> u64 { + self.0.f_blocks + } +@@ -305,7 +305,7 @@ impl Statfs { + target_os = "freebsd", + target_os = "openbsd", + target_os = "dragonfly", +- all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))) ++ all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))) + )))] + pub fn blocks(&self) -> libc::c_ulong { + self.0.f_blocks +@@ -330,7 +330,7 @@ impl Statfs { + } + + /// Free blocks in filesystem +- #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))] ++ #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))] + pub fn blocks_free(&self) -> u64 { + self.0.f_bfree + } +@@ -343,7 +343,7 @@ impl Statfs { + target_os = "freebsd", + target_os = "openbsd", + target_os = "dragonfly", +- all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))) ++ all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))) + )))] + pub fn blocks_free(&self) -> libc::c_ulong { + self.0.f_bfree +@@ -368,7 +368,7 @@ impl Statfs { + } + + /// Free blocks available to unprivileged user +- #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))] ++ #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))] + pub fn blocks_available(&self) -> u64 { + self.0.f_bavail + } +@@ -381,7 +381,7 @@ impl Statfs { + target_os = "freebsd", + target_os = "openbsd", + target_os = "dragonfly", +- all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))) ++ all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))) + )))] + pub fn blocks_available(&self) -> libc::c_ulong { + self.0.f_bavail +@@ -406,7 +406,7 @@ impl Statfs { + } + + /// Total file nodes in filesystem +- #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))] ++ #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))] + pub fn files(&self) -> libc::fsfilcnt_t { + self.0.f_files + } +@@ -419,7 +419,7 @@ impl Statfs { + target_os = "freebsd", + target_os = "openbsd", + target_os = "dragonfly", +- all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))) ++ all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))) + )))] + pub fn files(&self) -> libc::c_ulong { + self.0.f_files +@@ -449,7 +449,7 @@ impl Statfs { + } + + /// Free file nodes in filesystem +- #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))] ++ #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))] + pub fn files_free(&self) -> libc::fsfilcnt_t { + self.0.f_ffree + } +@@ -462,7 +462,7 @@ impl Statfs { + target_os = "freebsd", + target_os = "openbsd", + target_os = "dragonfly", +- all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))) ++ all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))) + )))] + pub fn files_free(&self) -> libc::c_ulong { + self.0.f_ffree +-- +2.35.1 + diff --git a/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb b/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb index 4429e4c32a2..143125bbb18 100644 --- a/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb @@ -24,9 +24,6 @@ RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" -SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=../cargo_home/bitbake/libsystemd-0.4.1/" -SRC_URI:append = " file://0001-riscv64-mod.rs-Add-missing-error-codes.patch;patchdir=../cargo_home/bitbake/libc-0.2.112/" - SRC_URI += " \ crate://crates.io/aho-corasick/0.7.18 \ crate://crates.io/atty/0.2.14 \ @@ -118,6 +115,12 @@ SRC_URI += " \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi/0.3.9 \ " +SRC_URI += "file://0001-riscv64-mod.rs-Add-missing-error-codes.patch;patchdir=../cargo_home/bitbake/libc-0.2.112/ \ + file://0001-riscv32-Define-O_LARGEFILE.patch;patchdir=../cargo_home/bitbake/libc-0.2.112/ \ + file://0001-linux.rs-Define-consts-for-rv32-architecture.patch;patchdir=../cargo_home/bitbake/nix-0.23.1/ \ + file://0001-statfs-Exclude-riscv32.patch;patchdir=../cargo_home/bitbake/nix-0.23.1/ \ + " +SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=../cargo_home/bitbake/libsystemd-0.4.1/" # The following configs & dependencies are from setuptools extras_require. # These dependencies are optional, hence can be controlled via PACKAGECONFIG. diff --git a/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.4.bb b/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.5.bb similarity index 87% rename from meta-python/recipes-devtools/python/python3-pyscaffold_4.1.4.bb rename to meta-python/recipes-devtools/python/python3-pyscaffold_4.1.5.bb index fbba75c4355..cd160a69eb0 100644 --- a/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.4.bb +++ b/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.5.bb @@ -9,7 +9,7 @@ LICENSE = "0BSD & MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=14a49c74a1d91829908ac756c07e6b91" DEPENDS += "python3-setuptools-scm-native" -SRC_URI[sha256sum] = "46a2bbdf255ba2efc6c56ae1428249b61d56c4a3e54ef3db0d05fa97792011a5" +SRC_URI[sha256sum] = "55f6532fd6d62b3b698d604257f7a7eda6a87557bbec22760f8c0d9549454802" inherit pypi setuptools3 PYPI_PACKAGE = "PyScaffold" diff --git a/meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb b/meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb new file mode 100644 index 00000000000..30ff62a7ed4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb @@ -0,0 +1,10 @@ +SUMMARY = "Python Serial Port Extension - Asynchronous I/O support" +HOMEPAGE = "https://github.com/pyserial/pyserial-asyncio" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9a79418f241689e78034391d51162d24" + +SRC_URI[sha256sum] = "b6032923e05e9d75ec17a5af9a98429c46d2839adfaf80604d52e0faacd7a32f" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-asyncio python3-core python3-pyserial" diff --git a/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb b/meta-python/recipes-devtools/python/python3-redis_4.1.4.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-redis_4.1.1.bb rename to meta-python/recipes-devtools/python/python3-redis_4.1.4.bb index 9af7383de35..5b5e144a9cf 100644 --- a/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-redis_4.1.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" -SRC_URI[sha256sum] = "07420a3fbedd8e012c31d4fadac943fb81568946da202c5a5bc237774e5280a0" +SRC_URI[sha256sum] = "1d9a0cdf89fdd93f84261733e24f55a7bbd413a9b219fdaf56e3e728ca9a2306" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.19.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb similarity index 87% rename from meta-python/recipes-devtools/python/python3-scrypt_0.8.19.bb rename to meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb index f0a9e16159c..c3869326833 100644 --- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.19.bb +++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb @@ -5,7 +5,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt" SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" -SRC_URI[sha256sum] = "ad143035ae0cf5e97c4b399f4e4686adf442c5f0f06f9f198a0cc6c091335fb7" +SRC_URI[sha256sum] = "0d226c1c6744fb2e308b391410669b1df5cfe82637ffcb5ed489bf82b2d2eb78" inherit pypi ptest setuptools3 dos2unix diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.63.0.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb rename to meta-python/recipes-devtools/python/python3-tqdm_4.63.0.bb index 148431d0adc..cd5f1aab53f 100644 --- a/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb +++ b/meta-python/recipes-devtools/python/python3-tqdm_4.63.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=1672e2674934fd93a31c09cf17f34100" -SRC_URI[sha256sum] = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d" +SRC_URI[sha256sum] = "1d9835ede8e394bb8c9dcbffbca02d717217113adc679236873eeaac5bc0b3cd" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb b/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb similarity index 99% rename from meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb rename to meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb index 6af9b6b92b0..2cf5ccc65d6 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.twistedmatrix.com" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0f8d67f84b6e178c92d471011b2245fc" -SRC_URI[sha256sum] = "b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61" +SRC_URI[sha256sum] = "57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2" PYPI_PACKAGE = "Twisted" diff --git a/meta-python/recipes-devtools/python/python3-waitress_2.0.0.bb b/meta-python/recipes-devtools/python/python3-waitress_2.1.0.bb similarity index 80% rename from meta-python/recipes-devtools/python/python3-waitress_2.0.0.bb rename to meta-python/recipes-devtools/python/python3-waitress_2.1.0.bb index 490dcee6c47..99e483962f3 100644 --- a/meta-python/recipes-devtools/python/python3-waitress_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-waitress_2.1.0.bb @@ -6,6 +6,6 @@ SECTION = "devel/python" LICENSE = "ZPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=78ccb3640dc841e1baecb3e27a6966b2" -SRC_URI[sha256sum] = "69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897" +SRC_URI[sha256sum] = "ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2" inherit setuptools3 pypi diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb index fcadf130c98..bd57604f262 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb @@ -19,16 +19,10 @@ SRC_URI += "\ " SRC_URI[sha256sum] = "1b05b77f3ee35d82c7a577a168c9ba0204d3e9a87eb1975e5f9af47700eeff48" -inherit pypi features_check systemd setuptools3 +inherit pypi features_check systemd setuptools3_legacy REQUIRED_DISTRO_FEATURES = "systemd" -do_install:append() { - mv ${D}${PYTHON_SITEPACKAGES_DIR}${exec_prefix}/* ${D}${exec_prefix} - mv ${D}${PYTHON_SITEPACKAGES_DIR}${sysconfdir} ${D} - mv ${D}${PYTHON_SITEPACKAGES_DIR}${base_libdir} ${D} -} - RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ parted python3-pyparted multipath-tools \ lsof cryptsetup libblockdev \ diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb index 995fb496221..c26ae1fe98e 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb @@ -16,7 +16,9 @@ SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protoc inherit features_check REQUIRED_DISTRO_FEATURES = "x11 systemd" -inherit setuptools3 python3native +inherit setuptools3_legacy python3native + +PIP_INSTALL_PACKAGE = "blivet_gui" RDEPENDS:${PN} = "python3-pygobject python3 \ python3-blivet gtk+3 \ diff --git a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch b/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch index b616b3fad37..2eb6be5a18c 100644 --- a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch +++ b/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch @@ -9,8 +9,7 @@ In Python 3.10 'distutils' is deprecated with removal slated for Python This also allows for a 'wheel' binary archive format to be built with 'setup.py bdist_wheel'. -Upstream-Status: Submitted -[https://github.com/rhinstaller/python-meh/pull/37] +Upstream-Status: Backport [cf9eafdd165347f86bb4a2534c41fd805db52322] Signed-off-by: Tim Orling diff --git a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb index 16596596a6f..1d9af438da0 100644 --- a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb +++ b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb @@ -1,11 +1,11 @@ SUMMARY = "A python library for handling exceptions" DESCRIPTION = "The python-meh package is a python library for handling, saving, and reporting \ exceptions." -HOMEPAGE = "http://git.fedorahosted.org/git/?p=python-meh.git" +HOMEPAGE = "https://github.com/rhinstaller/python-meh" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit setuptools3 +inherit setuptools3_legacy S = "${WORKDIR}/git" @@ -14,12 +14,4 @@ SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=rhe " SRCREV = "c321ce22950aff76611a3c6beffa02b5ea3adbed" -PIP_INSTALL_PACKAGE = "python_meh" - -do_install:append () { - install -d ${D}/${datadir}/python-meh - mv ${D}${PYTHON_SITEPACKAGES_DIR}${datadir}/python-meh/* ${D}/${datadir}/python-meh/ -} - -FILES:${PN} += "${datadir}/*" - +FILES:${PN} += "${datadir}/python-meh" diff --git a/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb b/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb new file mode 100644 index 00000000000..fde1029c74b --- /dev/null +++ b/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "pydot is is an interface to Graphviz." +HOMEPAGE = "https://github.com/pydot/pydot" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f6fa041dfcc7ff7747cfceaa34a3180" + +SRC_URI[sha256sum] = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "graphviz python3-pyparsing"