diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index d7700142037..207ab360342 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -62,7 +62,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-cantools \ python3-cassandra-driver \ python3-cbor2 \ - python3-cchardet \ python3-cerberus \ python3-certifi \ python3-chardet \ @@ -342,7 +341,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pytest-helpers-namespace \ python3-pytest-html \ python3-pytest-metadata \ - python3-pytest-runner \ python3-pytest-tempdir \ python3-pytest-timeout \ python3-pytest-xdist \ diff --git a/meta-python/recipes-devtools/python/python3-astroid_2.10.0.bb b/meta-python/recipes-devtools/python/python3-astroid_2.11.0.bb similarity index 89% rename from meta-python/recipes-devtools/python/python3-astroid_2.10.0.bb rename to meta-python/recipes-devtools/python/python3-astroid_2.11.0.bb index fc23f17c6b1..1a69be2f98c 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_2.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_2.11.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "f616b9687a5f4afa673dfd2d684d2b6f38365c8ad7c6f27229dda1ede750c445" +SRC_URI[sha256sum] = "d56f6a5239981567ceaa3413d4971936c7b4b0c796fcff90c24254dcf8b05b62" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-bitstruct_8.12.1.bb b/meta-python/recipes-devtools/python/python3-bitstruct_8.13.0.bb similarity index 79% rename from meta-python/recipes-devtools/python/python3-bitstruct_8.12.1.bb rename to meta-python/recipes-devtools/python/python3-bitstruct_8.13.0.bb index f53f84f83ef..954c9ab46c9 100644 --- a/meta-python/recipes-devtools/python/python3-bitstruct_8.12.1.bb +++ b/meta-python/recipes-devtools/python/python3-bitstruct_8.13.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/bitstruct" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "45b2b932ce6681f5c6ce8cba39abdd423b579b0568c76fa48b1e09c88368ede7" +SRC_URI[sha256sum] = "7b87d9e41ff552a8cae06ea2368c3772b6f3102bdab4b65e793be7590d69f03b" PYPI_PACKAGE = "bitstruct" diff --git a/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb b/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb deleted file mode 100644 index 75fe4df8d77..00000000000 --- a/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Universal encoding detector for Python 2 and 3" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[sha256sum] = "0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa" - -# setup.py of chardet needs this. -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -inherit pypi setuptools3 - -PACKAGES =+ "${PN}-cli" -FILES:${PN}-cli += " \ - ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ -" - -RDEPENDS:${PN}-cli = "${PN} " - -RDEPENDS:${PN}:class-target += " \ - ${PYTHON_PN}-logging \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cppy_1.1.0.bb b/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb similarity index 64% rename from meta-python/recipes-devtools/python/python3-cppy_1.1.0.bb rename to meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb index 79ddbed7c24..f86f571938a 100644 --- a/meta-python/recipes-devtools/python/python3-cppy_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb @@ -3,8 +3,9 @@ HOMEPAGE = "https://cppy.readthedocs.io/en/latest/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371" -SRC_URI[md5sum] = "2110891d75aa12551deebba1603428c6" -SRC_URI[sha256sum] = "4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642" +SRC_URI[sha256sum] = "95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc" + +RDEPENDS:${PN} += "python3-setuptools python3-distutils" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb b/meta-python/recipes-devtools/python/python3-dnspython_2.2.1.bb similarity index 88% rename from meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb rename to meta-python/recipes-devtools/python/python3-dnspython_2.2.1.bb index eb8269e4f59..67158fbdad3 100644 --- a/meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-dnspython_2.2.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.dnspython.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" -SRC_URI[sha256sum] = "e79351e032d0b606b98d38a4b0e6e2275b31a5b85c873e587cc11b73aca026d6" +SRC_URI[sha256sum] = "0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e" inherit pypi python_poetry_core ptest diff --git a/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb b/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb similarity index 59% rename from meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb rename to meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb index dac6cd48b9c..0f343b2fdd6 100644 --- a/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb @@ -1,11 +1,11 @@ SUMMARY = "A fast implementation of the Cassowary constraint solver" HOMEPAGE = "https://github.com/nucleic/kiwi" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=e54bd74bd9d0a84ae3f8f6d21ada0ab4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" -SRC_URI[sha256sum] = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c" +SRC_URI[sha256sum] = "7508b01e211178a85d21f1f87029846b77b2404a4c68cbd14748d4d4142fa3b8" -inherit pypi setuptools3 +inherit pypi setuptools_build_meta DEPENDS += "\ python3-cppy-native \ 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 deleted file mode 100644 index 0ecb50478e8..00000000000 --- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv32-Define-O_LARGEFILE.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 6143342178e..00000000000 --- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6f5bb3e7fe51733144497a3b5962b300f922a2d Mon Sep 17 00:00:00 2001 -From: Khem Raj -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: 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 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 -@@ -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; -+pub const EUCLEAN: ::c_int = 117; -+pub const ENOTNAM: ::c_int = 118; -+pub const ENAVAIL: ::c_int = 119; -+pub const EISNAM: ::c_int = 120; -+pub const EREMOTEIO: ::c_int = 121; - pub const EDQUOT: ::c_int = 122; - pub const ENOMEDIUM: ::c_int = 123; - pub const EMEDIUMTYPE: ::c_int = 124; --- -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 deleted file mode 100644 index b482d7c0db3..00000000000 --- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-statfs-Exclude-riscv32.patch +++ /dev/null @@ -1,108 +0,0 @@ -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 97fce690ec8..1f1c186d314 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 @@ -63,7 +63,7 @@ SRC_URI += " \ crate://crates.io/humantime/2.1.0 \ crate://crates.io/instant/0.1.12 \ crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.112 \ + crate://crates.io/libc/0.2.120 \ crate://crates.io/libsystemd/0.4.1 \ crate://crates.io/log/0.4.14 \ crate://crates.io/memchr/2.4.1 \ @@ -115,10 +115,8 @@ 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/ \ +SRC_URI += "\ 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/" diff --git a/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb b/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb deleted file mode 100644 index fed2d91140f..00000000000 --- a/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Invoke py.test as distutils command with dependency resolution" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" - -SRC_URI[sha256sum] = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91" - -inherit pypi setuptools_build_meta - -DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-debugger ${PYTHON_PN}-json \ - ${PYTHON_PN}-io" - -BBCLASSEXTEND = "native nativesdk"