diff --git a/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb b/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb index 6463f49bb51..183836f406f 100644 --- a/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb +++ b/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb @@ -10,6 +10,8 @@ SRCREV = "6145b6484d220685edfd922d364afbf065127efe" S = "${WORKDIR}/git" inherit setuptools3 +PIP_INSTALL_PACKAGE = "python_apt" +PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.0.0-*.whl" DEPENDS += "apt" RDEPENDS:${PN} += "apt python3-core" diff --git a/meta-oe/recipes-devtools/python/python3-distutils-extra.bb b/meta-oe/recipes-devtools/python/python3-distutils-extra.bb deleted file mode 100644 index 580842d0d66..00000000000 --- a/meta-oe/recipes-devtools/python/python3-distutils-extra.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-distutils-extra.inc - -inherit setuptools3 - -S = "${WORKDIR}/python-distutils-extra-${PV}" - -RDEPENDS:${PN} = "\ - python3-setuptools \ -" diff --git a/meta-oe/recipes-devtools/python/python-distutils-extra.inc b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb similarity index 82% rename from meta-oe/recipes-devtools/python/python-distutils-extra.inc rename to meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb index 3430cedf637..8aca4ca3acc 100644 --- a/meta-oe/recipes-devtools/python/python-distutils-extra.inc +++ b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb @@ -5,9 +5,13 @@ SECTION = "devel/python" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4" -PV = "2.39" SRC_URI = "https://launchpad.net/python-distutils-extra/trunk/${PV}/+download/python-distutils-extra-${PV}.tar.gz" -SRC_URI[md5sum] = "16e06db0ef73a35b4bff4b9eed5699b5" SRC_URI[sha256sum] = "723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af" +inherit setuptools3 + +PIP_INSTALL_PACKAGE = "python_distutils_extra" + +S = "${WORKDIR}/python-distutils-extra-${PV}" + BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb b/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb index dd00f444edf..3866e60a121 100644 --- a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb +++ b/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb @@ -16,4 +16,4 @@ DEPENDS += "cups" # See https://pypi.org/project/pycups/ for data SRC_URI[sha256sum] = "57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90" -inherit pypi setuptools3 \ No newline at end of file +inherit pypi setuptools_build_meta diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index d90e6551e77..7d8489caf55 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -26,7 +26,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-alembic \ python3-ansi2html \ python3-ansicolors \ - python3-anyjson \ python3-appdirs \ python3-apply-defaults \ python3-argcomplete \ @@ -437,7 +436,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-twine \ python3-twisted \ python3-twitter \ - python3-twofish \ python3-txaio \ python3-txdbus \ python3-txws \ @@ -485,7 +483,6 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\ python3-jinja2-ptest \ python3-markupsafe-ptest \ python3-ansicolors-ptest \ - python3-anyjson-ptest \ python3-appdirs-ptest \ python3-backports-functools-lru-cache-ptest \ python3-bcrypt-ptest \ diff --git a/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb b/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb deleted file mode 100644 index 2b8abb8b808..00000000000 --- a/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Wraps the best available JSON implementation available in a common interface" -DESCRIPTION = "Anyjson loads whichever is the fastest JSON module installed and \ -provides a uniform API regardless of which JSON implementation is used." -HOMEPAGE = "https://bitbucket.org/runeh/anyjson" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=989aa97e73c912a83a3c873fa11deb08" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://0001-setup.py-Do-not-use-2to3.patch \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-nose \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -SRC_URI[md5sum] = "2ea28d6ec311aeeebaf993cb3008b27c" -SRC_URI[sha256sum] = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba" - -RDEPENDS:${PN} += "${PYTHON_PN}-simplejson" diff --git a/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb b/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb index 56b1485342e..16cd58892c4 100644 --- a/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb @@ -9,4 +9,4 @@ PYPI_PACKAGE = "backcall" SRC_URI[md5sum] = "1f4c9a370c78743406296f48e56e8821" SRC_URI[sha256sum] = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e" -inherit setuptools3 pypi +inherit flit_core pypi diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.10.bb b/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.10.bb rename to meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb index 3c1e6804e6f..47b8579a1a3 100644 --- a/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.10.bb +++ b/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ousret/charset_normalizer" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0974a390827087287db39928f7c524b5" -SRC_URI[sha256sum] = "876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd" +SRC_URI[sha256sum] = "2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-cryptography_36.0.1.bb b/meta-python/recipes-devtools/python/python3-cryptography_36.0.1.bb index abb15381f57..00791dce2de 100644 --- a/meta-python/recipes-devtools/python/python3-cryptography_36.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-cryptography_36.0.1.bb @@ -20,6 +20,8 @@ SRC_URI += " \ inherit pypi setuptools3_rust +PIP_INSTALL_DIST_PATH = "${S}/dist" + DEPENDS += " \ ${PYTHON_PN}-asn1crypto-native \ ${PYTHON_PN}-cffi-native \ diff --git a/meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb b/meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb index 4337d8558ed..8e907462ae8 100644 --- a/meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/geomet/geomet.git;protocol=https;branch=release-${PV SRCREV = "73ec5ec96cca32f2e2461d3964fc3d4ab80248f9" inherit setuptools3 +PIP_INSTALL_PACKAGE = "geomet" RDEPENDS:${PN} += "\ ${PYTHON_PN}-click \ diff --git a/meta-python/recipes-devtools/python/python3-monotonic_1.6.bb b/meta-python/recipes-devtools/python/python3-monotonic_1.6.bb index aacc32a6d69..2af7b57921b 100644 --- a/meta-python/recipes-devtools/python/python3-monotonic_1.6.bb +++ b/meta-python/recipes-devtools/python/python3-monotonic_1.6.bb @@ -11,3 +11,5 @@ SRC_URI = "git://github.com/atdt/monotonic.git;branch=master;protocol=https" S = "${WORKDIR}/git" inherit setuptools3 + +PIP_INSTALL_PACKAGE = "monotonic" diff --git a/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb b/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb index 65af4121f96..34cd096c9d7 100644 --- a/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-pako_0.3.1.bb @@ -8,5 +8,6 @@ SRC_URI[sha256sum] = "c033a073bb818ca336ae1fccba2655bd60dfe77744f85d4517abd3160d inherit pypi setuptools3 do_install:append() { - rm -rf ${D}/usr/share + rm -rf ${D}${prefix}/pako/LICENSE + rm -rf ${D}${prefix}/pako } diff --git a/meta-python/recipes-devtools/python/python3-pillow_9.0.0.bb b/meta-python/recipes-devtools/python/python3-pillow_9.0.0.bb index de3c92c3d33..487e4b54c4b 100644 --- a/meta-python/recipes-devtools/python/python3-pillow_9.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-pillow_9.0.0.bb @@ -13,6 +13,9 @@ SRCREV ?= "82541b6dec8452cb612067fcebba1c5a1a2bfdc8" inherit setuptools3 +PIP_INSTALL_PACKAGE = "Pillow" +PIP_INSTALL_DIST_PATH = "${S}/dist" + DEPENDS += " \ zlib \ jpeg \ diff --git a/meta-python/recipes-devtools/python/python3-prettytable_2.4.0.bb b/meta-python/recipes-devtools/python/python3-prettytable_3.1.1.bb similarity index 92% rename from meta-python/recipes-devtools/python/python3-prettytable_2.4.0.bb rename to meta-python/recipes-devtools/python/python3-prettytable_3.1.1.bb index 8f5eb429966..3b75086fca1 100644 --- a/meta-python/recipes-devtools/python/python3-prettytable_2.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-prettytable_3.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://code.google.com/p/prettytable" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671" -SRC_URI[sha256sum] = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca" +SRC_URI[sha256sum] = "43c9e23272ca253d038ae76fe3adde89794e92e7fcab2ddf5b94b38642ef4f21" do_install:append() { perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` diff --git a/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb b/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb index ff1155eeb14..e19ec7522e3 100644 --- a/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb @@ -8,7 +8,7 @@ SRCNAME = "ptyprocess" SRC_URI[sha256sum] = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220" -inherit pypi setuptools3 +inherit pypi flit_core UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ptyprocess" 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 b83302d44c9..4429e4c32a2 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 @@ -14,6 +14,8 @@ S = "${WORKDIR}/pyruvate-${PV}" inherit pypi setuptools3_rust +PIP_INSTALL_DIST_PATH = "${S}/dist" + # crossbeam-* -> std::sync::atomic AtomicI64, AtomicU64 # not supported on mips/powerpc with 32-bit pointers # https://doc.rust-lang.org/std/sync/atomic/#portability diff --git a/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb b/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb index 4766d92266d..15646235df4 100644 --- a/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb +++ b/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb @@ -9,6 +9,7 @@ inherit pypi setuptools3 ptest do_install:append() { rm -f ${D}${bindir}/pyserial-miniterm rm -f ${D}${bindir}/pyserial-ports + rm -rf ${D}${bindir}/__pycache__ rmdir ${D}${bindir} } diff --git a/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb b/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb index 34ff91241f3..1afb3f0e0fb 100644 --- a/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb @@ -12,8 +12,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=011cd92e702dd9e6b1a26157b6fd53f5" SRC_URI = "https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a/setuptools-rust-${PV}.tar.gz" SRC_URI[sha256sum] = "a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1" +# While this has a pyproject.toml and declares that setuptools_build_meta should work +# it results in a wheel named UNKNOWN-0.0.0-py3-none-any.whl so stay with setuptools3 +# until that can be resolved inherit cargo pypi setuptools3 native +# For some reason the wheel is built in ${S} not ${B} +PIP_INSTALL_DIST_PATH = "${S}/dist" + + DEPENDS += "python3-setuptools-scm-native python3-wheel-native" RDEPENDS:${PN}:class-native += " \ diff --git a/meta-python/recipes-devtools/python/python3-transitions_0.8.10.bb b/meta-python/recipes-devtools/python/python3-transitions_0.8.11.bb similarity index 75% rename from meta-python/recipes-devtools/python/python3-transitions_0.8.10.bb rename to meta-python/recipes-devtools/python/python3-transitions_0.8.11.bb index 46292987b10..14189424a2c 100644 --- a/meta-python/recipes-devtools/python/python3-transitions_0.8.10.bb +++ b/meta-python/recipes-devtools/python/python3-transitions_0.8.11.bb @@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=baac7be1f4c17620df74188e23da6d47" inherit pypi setuptools3 -SRC_URI[sha256sum] = "b0385975a842e885c1a55c719d2f90164471665794d39d51f9eb3f11e1d9c8ac" +SRC_URI[sha256sum] = "7b20d32906ea4d60ee6f6c1f5dc9c9f178802425c5b155213eb0f25c277f04e4" RDEPENDS:${PN} += "python3-six python3-logging" diff --git a/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb b/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb index 8fd7801c353..6af9b6b92b0 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb @@ -80,8 +80,7 @@ RDEPENDS:${PN}-flow += "${PN}-core" RDEPENDS:${PN}-pair += "${PN}-core" RDEPENDS:${PN}-dbg = "${PN}" -ALLOW_EMPTY:${PN} = "1" -FILES:${PN} = "" +FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/${PYPI_PACKAGE}-${PV}.dist-info/*" FILES:${PN}-test = " \ ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ diff --git a/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch b/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch deleted file mode 100644 index c25b2457e2a..00000000000 --- a/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5704610f4b3aed5210e9c5b7c05ff8b5b2364c9c Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 12 Aug 2019 08:18:21 +0000 -Subject: [PATCH] Fix missing return statements in module stubs - -* fixes build with -Werror=return-type - twofish.c: In function 'init_twofish': - twofish.c:45:1: error: control reaches end of non-void function [-Werror=return-type] - 45 | PyMODINIT_FUNC init_twofish(void) { } - | ^~~~~~~~~~~~~~ - twofish.c: In function 'PyInit__twofish': - twofish.c:46:1: error: control reaches end of non-void function [-Werror=return-type] - 46 | PyMODINIT_FUNC PyInit__twofish(void) { } - | ^~~~~~~~~~~~~~ - cc1: some warnings being treated as errors - -Signed-off-by: Martin Jansa - -Upstream-Status: Submitted [https://github.com/keybase/python-twofish/pull/6] ---- - twofish.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/twofish.c b/twofish.c -index e324c34..d4487d8 100644 ---- a/twofish.c -+++ b/twofish.c -@@ -42,5 +42,5 @@ DL_EXPORT(void) exp_Twofish_decrypt(Twofish_key * xkey, uint8_t c[16], uint8_t p - We need a stub init_twofish function so the module will link as a proper module. - Do not import _twofish from python; it will not work since _twofish is not a *real* module - */ --PyMODINIT_FUNC init_twofish(void) { } --PyMODINIT_FUNC PyInit__twofish(void) { } -+PyMODINIT_FUNC init_twofish(void) { return NULL; } -+PyMODINIT_FUNC PyInit__twofish(void) { return NULL; } --- -2.17.1 - diff --git a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb b/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb deleted file mode 100644 index 94fb71090e4..00000000000 --- a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Bindings for the Twofish implementation by Niels Ferguson" -DESCRIPTION = "Bindings for the Twofish implementation by Niels Ferguson\ - libtwofish-dev." -HOMEPAGE = "http://github.com/keybase/python-twofish" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=33a63abf6d7567b1689d8ce69f00e43b" - -SRC_URI += "file://0001-Fix-missing-return-statements-in-module-stubs.patch" - -SRC_URI[md5sum] = "d7d22f16dc4ffa0e3ae2200654033abe" -SRC_URI[sha256sum] = "b09d8bb50d33b23ff34cafb1f9209f858f752935c6a5c901efb92a41acb830fa" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb b/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb index bd6853e7478..da0dc267153 100644 --- a/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb @@ -17,6 +17,8 @@ SRCREV = "b8d573e11ec149da695d695c81a156232b89a949" S = "${WORKDIR}/git" inherit ptest setuptools3 +PIP_INSTALL_PACKAGE = "xlrd" +PIP_INSTALL_DIST_PATH = "${S}/dist" RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb index 65fc88e77bf..7aa07584000 100644 --- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb +++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb @@ -23,3 +23,5 @@ SRCREV = "bfd836cfdd8439d984595aca015811ed5c6be733" UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" inherit setuptools3 +PIP_INSTALL_PACKAGE = "pykickstart" +PIP_INSTALL_DIST_PATH = "${S}/dist"