diff --git a/meta-python/classes/poetry_core.bbclass b/meta-python/classes/poetry_core.bbclass deleted file mode 100644 index b2b80efa4ff..00000000000 --- a/meta-python/classes/poetry_core.bbclass +++ /dev/null @@ -1,15 +0,0 @@ -inherit python_pep517 python3native setuptools3-base - -DEPENDS += "python3-poetry-core-native" - -poetry_core_do_configure () { - : -} - -# TODO: ideally this uses pypa/build -poetry_core_do_compile () { - nativepython3 -c "from poetry.core.masonry import api; api.build_wheel('${PEP517_WHEEL_PATH}')" -} -do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" - -EXPORT_FUNCTIONS do_configure do_compile diff --git a/meta-python/classes/pyo3.bbclass b/meta-python/classes/pyo3.bbclass deleted file mode 100644 index 6ce21329c2e..00000000000 --- a/meta-python/classes/pyo3.bbclass +++ /dev/null @@ -1,30 +0,0 @@ -# -# This class helps make sure that Python extensions built with PyO3 -# and setuptools_rust properly set up the environment for cross compilation -# - -inherit cargo python3-dir siteinfo - -export PYO3_CROSS="1" -export PYO3_CROSS_PYTHON_VERSION="${PYTHON_BASEVERSION}" -export PYO3_CROSS_LIB_DIR="${STAGING_LIBDIR}" -export CARGO_BUILD_TARGET="${HOST_SYS}" -export RUSTFLAGS -export PYO3_PYTHON="${PYTHON}" -export PYO3_CONFIG_FILE="${WORKDIR}/pyo3.config" - -pyo3_do_configure () { - cat > ${WORKDIR}/pyo3.config << EOF -implementation=CPython -version=${PYTHON_BASEVERSION} -shared=true -abi3=false -lib_name=${PYTHON_DIR} -lib_dir=${STAGING_LIBDIR} -pointer_width=${SITEINFO_BITS} -build_flags=WITH_THREAD -suppress_build_script_link_lines=false -EOF -} - -EXPORT_FUNCTIONS do_configure diff --git a/meta-python/classes/setuptools3_rust.bbclass b/meta-python/classes/setuptools3_rust.bbclass deleted file mode 100644 index fb11f08f89c..00000000000 --- a/meta-python/classes/setuptools3_rust.bbclass +++ /dev/null @@ -1,11 +0,0 @@ -inherit pyo3 setuptools3 - -DEPENDS += "python3-setuptools-rust-native" - -setuptools3_rust_do_configure() { - pyo3_do_configure - cargo_common_do_configure - setuptools3_do_configure -} - -EXPORT_FUNCTIONS do_configure diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index b53bb68d899..d7700142037 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -33,7 +33,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-argh \ python3-arpeggio \ python3-asciitree \ - python3-asn1crypto \ python3-aspectlib \ python3-astor \ python3-astroid \ @@ -47,7 +46,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-babel \ python3-backcall \ python3-bandit \ - python3-bcrypt \ python3-beautifulsoup4 \ python3-behave \ python3-betamax \ @@ -67,7 +65,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-cchardet \ python3-cerberus \ python3-certifi \ - python3-cffi \ python3-chardet \ python3-charset-normalizer \ python3-cheetah \ @@ -88,8 +85,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-cppy \ python3-crcmod \ python3-croniter \ - python3-cryptography \ - python3-cryptography-vectors \ python3-cson \ python3-custom-inherit \ python3-cvxopt \ @@ -191,7 +186,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-ipython \ python3-ipython-genutils \ python3-iso3166 \ - python3-iso8601 \ python3-isodate \ python3-isort \ python3-itsdangerous \ @@ -277,22 +271,18 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pint \ python3-pkcs11 \ python3-pkgconfig \ - python3-ply \ - python3-poetry-core \ python3-pocketsphinx \ python3-polyline \ python3-portalocker \ python3-posix-ipc \ python3-prctl \ python3-precise-runner \ - python3-pretend \ python3-prettytable \ python3-priority \ python3-process-tests \ python3-progress \ python3-prompt-toolkit \ python3-protobuf \ - python3-psutil \ python3-ptyprocess \ python3-pulsectl \ python3-py-cpuinfo \ @@ -309,7 +299,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pycocotools \ python3-pycodestyle \ python3-pyconnman \ - python3-pycparser \ python3-pycurl \ python3-pydbus \ python3-pydbus-manager \ @@ -354,7 +343,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pytest-html \ python3-pytest-metadata \ python3-pytest-runner \ - python3-pytest-subtests \ python3-pytest-tempdir \ python3-pytest-timeout \ python3-pytest-xdist \ @@ -362,7 +350,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-python-vlc \ python3-pytoml \ python3-pytun \ - python3-pytz \ python3-pytz-deprecation-shim \ python3-pyudev \ python3-pyusb \ @@ -391,7 +378,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-scrypt \ python3-sdnotify \ python3-semver \ - python3-semantic-version \ python3-send2trash \ python3-sentry-sdk \ python3-serpent \ @@ -439,7 +425,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-txws \ python3-typed-ast \ python3-typeguard \ - python3-typing-extensions \ python3-tzlocal \ python3-u-msgpack-python \ python3-ujson \ @@ -477,18 +462,15 @@ RDEPENDS:packagegroup-meta-python3 = "\ " RDEPENDS:packagegroup-meta-python3-ptest = "\ - python3-cryptography-ptest \ python3-jinja2-ptest \ python3-markupsafe-ptest \ python3-ansicolors-ptest \ python3-appdirs-ptest \ - python3-bcrypt-ptest \ python3-betamax-ptest \ python3-blinker-ptest \ python3-cachetools-ptest \ python3-cbor2-ptest \ python3-click-ptest \ - python3-cryptography-ptest \ python3-dnspython-ptest \ python3-dominate-ptest \ python3-geojson-ptest \ @@ -518,7 +500,6 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\ python3-pyroute2-ptest \ python3-pyserial-ptest \ python3-pytoml-ptest \ - python3-pytz-ptest \ python3-requests-file-ptest \ python3-requests-toolbelt-ptest \ python3-scrypt-ptest \ diff --git a/meta-python/recipes-devtools/python/python3-aiofiles_0.8.0.bb b/meta-python/recipes-devtools/python/python3-aiofiles_0.8.0.bb index d3bca2c2130..d50cb8e6f46 100644 --- a/meta-python/recipes-devtools/python/python3-aiofiles_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-aiofiles_0.8.0.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "8334f23235248a3b2e83b2c3a78a22674f39969b96397126cc93664d9a PYPI_PACKAGE = "aiofiles" -inherit pypi poetry_core +inherit pypi python_poetry_core RDEPENDS:${PN} = "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb b/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb deleted file mode 100644 index c052cb8c827..00000000000 --- a/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A fast, pure Python library for parsing and serializing ASN.1 structures" -HOMEPAGE = "https://github.com/wbond/asn1crypto" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7439e38f5e04ff62fae436184786b7ca" - -PYPI_PACKAGE = "asn1crypto" - -SRC_URI[md5sum] = "00bf5b72d37778e62cc73b1d8909ae27" -SRC_URI[sha256sum] = "f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c" - -inherit pypi setuptools3 - -RDEPENDS:${PN}:class-target += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-bcrypt/run-ptest b/meta-python/recipes-devtools/python/python3-bcrypt/run-ptest deleted file mode 100644 index b63c4de0d9a..00000000000 --- a/meta-python/recipes-devtools/python/python3-bcrypt/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/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-bcrypt_3.2.0.bb b/meta-python/recipes-devtools/python/python3-bcrypt_3.2.0.bb deleted file mode 100644 index 92a6a0d8c5f..00000000000 --- a/meta-python/recipes-devtools/python/python3-bcrypt_3.2.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Modern password hashing for your software and your servers." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" - -DEPENDS += "${PYTHON_PN}-cffi-native" - -SRC_URI[md5sum] = "fe31390dab603728f756cd3d6830c80a" -SRC_URI[sha256sum] = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29" - -inherit pypi setuptools_build_meta ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-six \ -" diff --git a/meta-python/recipes-devtools/python/python3-cffi_1.15.0.bb b/meta-python/recipes-devtools/python/python3-cffi_1.15.0.bb deleted file mode 100644 index c36f23b3dde..00000000000 --- a/meta-python/recipes-devtools/python/python3-cffi_1.15.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Foreign Function Interface for Python calling C code" -HOMEPAGE = "http://cffi.readthedocs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" -DEPENDS += "libffi ${PYTHON_PN}-pycparser" - -SRC_URI[sha256sum] = "920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954" - -inherit pypi setuptools3 - -RDEPENDS:${PN}:class-target = " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pycparser \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-cryptography-vectors_36.0.1.bb b/meta-python/recipes-devtools/python/python3-cryptography-vectors_36.0.1.bb deleted file mode 100644 index b9e6b811c37..00000000000 --- a/meta-python/recipes-devtools/python/python3-cryptography-vectors_36.0.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Test vectors for the cryptography package." -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ - file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ - file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b" - -# NOTE: Make sure to keep this recipe at the same version as python3-cryptography -# Upgrade both recipes at the same time - -SRC_URI[sha256sum] = "fc8490afd5424342b868215435bd174dcd76ab396b4ea9435498be5721dcd598" - -PYPI_PACKAGE = "cryptography_vectors" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-cryptography \ -" - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_REGEX = "" diff --git a/meta-python/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch b/meta-python/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch deleted file mode 100644 index d7ab757bb51..00000000000 --- a/meta-python/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ec8d3f3c61280c8140b34ed1479baef5e706f064 Mon Sep 17 00:00:00 2001 -From: Tim Orling -Date: Fri, 14 Jan 2022 22:02:25 -0800 -Subject: [PATCH] Cargo.toml: specify pem version - -pem = "1.0" is not resolving, specify the current -pem = { version: "1.0.2"} - -Upstream-Status: Pending - -Signed-off-by: Tim Orling ---- - src/rust/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml -index 617167d0..174eaa80 100644 ---- a/src/rust/Cargo.toml -+++ b/src/rust/Cargo.toml -@@ -9,7 +9,7 @@ publish = false - lazy_static = "1" - pyo3 = { version = "0.15.1" } - asn1 = { version = "0.8.7", default-features = false, features = ["derive"] } --pem = "1.0" -+pem = { version = "1.0.2" } - chrono = { version = "0.4", default-features = false, features = ["alloc", "clock"] } - ouroboros = "0.13" - --- -2.30.2 - diff --git a/meta-python/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch b/meta-python/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch deleted file mode 100644 index 366e3a4d39a..00000000000 --- a/meta-python/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b73298b214a5b69ea6edf3c2e21dd82b2b29708 Mon Sep 17 00:00:00 2001 -From: Tim Orling -Date: Fri, 14 Jan 2022 22:34:59 -0800 -Subject: [PATCH 2/2] Cargo.toml: edition 2018 -> 2021 - -Upstream-Status: Pending - -Signed-off-by: Tim Orling ---- - src/rust/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml -index 174eaa80..7ad053d9 100644 ---- a/src/rust/Cargo.toml -+++ b/src/rust/Cargo.toml -@@ -2,7 +2,7 @@ - name = "cryptography-rust" - version = "0.1.0" - authors = ["The cryptography developers "] --edition = "2018" -+edition = "2021" - publish = false - - [dependencies] --- -2.30.2 - diff --git a/meta-python/recipes-devtools/python/python3-cryptography/check-memfree.py b/meta-python/recipes-devtools/python/python3-cryptography/check-memfree.py deleted file mode 100755 index c111a9074c1..00000000000 --- a/meta-python/recipes-devtools/python/python3-cryptography/check-memfree.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 -# https://stackoverflow.com/questions/22102999/get-total-physical-memory-in-python/28161352 -import sys -meminfo = dict((i.split()[0].rstrip(':'),int(i.split()[1])) for i in open('/proc/meminfo').readlines()) -mem_free = meminfo['MemTotal']/1024./1024. -if mem_free < 2.: - raise RuntimeError("Insufficient free memory({:.3f}): requires > 2 GB".format(mem_free)) - sys.exit(1) -else: - print("Free memory: {:.3f} GB".format(mem_free)) diff --git a/meta-python/recipes-devtools/python/python3-cryptography/run-ptest b/meta-python/recipes-devtools/python/python3-cryptography/run-ptest deleted file mode 100644 index 1e97dda63e7..00000000000 --- a/meta-python/recipes-devtools/python/python3-cryptography/run-ptest +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -if ./check-memfree.py; then - pytest -vvvv tests/ -fi 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 deleted file mode 100644 index 00791dce2de..00000000000 --- a/meta-python/recipes-devtools/python/python3-cryptography_36.0.1.bb +++ /dev/null @@ -1,123 +0,0 @@ -SUMMARY = "Provides cryptographic recipes and primitives to python developers" -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "( Apache-2.0 | BSD-3-Clause ) & PSF-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba \ - file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ - file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ - file://LICENSE.PSF;md5=43c37d21e1dbad10cddcd150ba2c0595 \ - " -LDSHARED += "-pthread" - -SRC_URI[sha256sum] = "53e5c1dc3d7a953de055d77bef2ff607ceef7a2aac0353b5d630ab67f7423638" - -SRC_URI += " \ - file://run-ptest \ - file://check-memfree.py \ - file://0001-Cargo.toml-specify-pem-version.patch \ - file://0002-Cargo.toml-edition-2018-2021.patch \ -" - -inherit pypi setuptools3_rust - -PIP_INSTALL_DIST_PATH = "${S}/dist" - -DEPENDS += " \ - ${PYTHON_PN}-asn1crypto-native \ - ${PYTHON_PN}-cffi-native \ - ${PYTHON_PN}-setuptools-rust-native \ - ${PYTHON_PN}-six-native \ -" - -SRC_URI += " \ - crate://crates.io/Inflector/0.11.4 \ - crate://crates.io/aliasable/0.1.3 \ - crate://crates.io/asn1/0.8.7 \ - crate://crates.io/asn1_derive/0.8.7 \ - crate://crates.io/autocfg/1.0.1 \ - crate://crates.io/base64/0.13.0 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.19 \ - crate://crates.io/indoc-impl/0.3.6 \ - crate://crates.io/indoc/0.3.6 \ - 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/lock_api/0.4.5 \ - crate://crates.io/num-integer/0.1.44 \ - crate://crates.io/num-traits/0.2.14 \ - crate://crates.io/once_cell/1.9.0 \ - crate://crates.io/ouroboros/0.13.0 \ - crate://crates.io/ouroboros_macro/0.13.0 \ - crate://crates.io/parking_lot/0.11.2 \ - crate://crates.io/parking_lot_core/0.8.5 \ - crate://crates.io/paste-impl/0.1.18 \ - crate://crates.io/paste/0.1.18 \ - crate://crates.io/pem/1.0.2 \ - crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro-hack/0.5.19 \ - crate://crates.io/proc-macro2/1.0.36 \ - crate://crates.io/pyo3-build-config/0.15.1 \ - crate://crates.io/pyo3-macros-backend/0.15.1 \ - crate://crates.io/pyo3-macros/0.15.1 \ - crate://crates.io/pyo3/0.15.1 \ - crate://crates.io/quote/1.0.14 \ - crate://crates.io/redox_syscall/0.2.10 \ - crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/smallvec/1.7.0 \ - crate://crates.io/stable_deref_trait/1.2.0 \ - crate://crates.io/syn/1.0.85 \ - crate://crates.io/unicode-xid/0.2.2 \ - crate://crates.io/unindent/0.1.7 \ - crate://crates.io/version_check/0.9.4 \ - crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi/0.3.9 \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ -" - -RDEPENDS:${PN}:append:class-target = " \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-bcrypt \ - ${PYTHON_PN}-cryptography-vectors \ - ${PYTHON_PN}-hypothesis \ - ${PYTHON_PN}-iso8601 \ - ${PYTHON_PN}-pretend \ - ${PYTHON_PN}-psutil \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-subtests \ - ${PYTHON_PN}-pytz \ -" - -inherit ptest - -do_install_ptest() { - install -D ${WORKDIR}/check-memfree.py ${D}${PTEST_PATH}/ - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/tests/hazmat - cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ - cp -r ${S}/pyproject.toml ${D}${PTEST_PATH}/ -} - -FILES:${PN}-ptest += " \ - ${PTEST_PATH}/check-memfree.py \ -" -FILES:${PN}-dbg += " \ - ${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/hazmat/bindings/.debug \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb b/meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb index cf76a142b53..eb8269e4f59 100644 --- a/meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" SRC_URI[sha256sum] = "e79351e032d0b606b98d38a4b0e6e2275b31a5b85c873e587cc11b73aca026d6" -inherit pypi poetry_core ptest +inherit pypi python_poetry_core ptest SRC_URI += " \ file://run-ptest \ diff --git a/meta-python/recipes-devtools/python/python3-iso8601_1.0.2.bb b/meta-python/recipes-devtools/python/python3-iso8601_1.0.2.bb deleted file mode 100644 index aabc47d69b9..00000000000 --- a/meta-python/recipes-devtools/python/python3-iso8601_1.0.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Simple module to parse ISO 8601 dates" -HOMEPAGE = "http://pyiso8601.readthedocs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b05625f2336fa024e8d57e65c6595844" - -SRC_URI[sha256sum] = "27f503220e6845d9db954fb212b95b0362d8b7e6c1b2326a87061c3de93594b1" - -inherit pypi poetry_core - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-isort_5.10.1.bb b/meta-python/recipes-devtools/python/python3-isort_5.10.1.bb index 6a6d5ed1301..27977821c61 100644 --- a/meta-python/recipes-devtools/python/python3-isort_5.10.1.bb +++ b/meta-python/recipes-devtools/python/python3-isort_5.10.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148 SRC_URI[sha256sum] = "e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951" -inherit pypi poetry_core +inherit pypi python_poetry_core RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ diff --git a/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb b/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb index c5a74796a0e..1aa91deac52 100644 --- a/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb +++ b/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb @@ -10,7 +10,7 @@ RDEPENDS:${PN} = "pkgconfig \ ${PYTHON_PN}-shell \ " -inherit pypi poetry_core +inherit pypi python_poetry_core BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-ply_3.11.bb b/meta-python/recipes-devtools/python/python3-ply_3.11.bb deleted file mode 100644 index 99c037bb734..00000000000 --- a/meta-python/recipes-devtools/python/python3-ply_3.11.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Python Lex and Yacc" -DESCRIPTION = "Python ply: PLY is yet another implementation of lex and yacc for Python" -HOMEPAGE = "https://pypi.python.org/pypi/ply" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://README.md;beginline=5;endline=32;md5=f5ee5c355c0e6719c787a71b8f0fa96c" - -SRC_URI[md5sum] = "6465f602e656455affcd7c5734c638f8" -SRC_URI[sha256sum] = "00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3" - -inherit pypi setuptools3 - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native" 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 deleted file mode 100644 index 22d7076d01b..00000000000 --- a/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Poetry PEP 517 Build Backend" -DESCRIPTION = "Poetry PEP 517 Build Backend" -HOMEPAGE = "https://github.com/python-poetry/poetry-core" -BUGTRACKER = "https://github.com/python-poetry/poetry-core" -CHANGELOG = "https://github.com/python-poetry/poetry-core/blob/master/CHANGELOG.md" - -LICENSE = "Apache-2.0 & BSD-2-Clause & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=104d5c3c653aeededf4076773aa4c236 \ - file://poetry/core/_vendor/attrs.LICENSE;md5=75bb9823a2778b5a2bd9b793fac93ea2 \ - file://poetry/core/_vendor/jsonschema/COPYING;md5=6554d3a51d7cb0b611891317f3c69057 \ - file://poetry/core/_vendor/jsonschema/LICENSE;md5=2ecb81765361195731a6f72a89e449fd \ - file://poetry/core/_vendor/lark-parser.LICENSE;md5=b37b83a9cf129d92ee65aaa71c01ce72 \ - file://poetry/core/_vendor/packaging/LICENSE;md5=7a6e56c9d54ecd731ab31c52de7942f0 \ - file://poetry/core/_vendor/packaging/LICENSE.APACHE;md5=29256199be2a609aac596980ffc11996 \ - file://poetry/core/_vendor/packaging/LICENSE.BSD;md5=f405810d173a1618433827928768bcd2 \ - file://poetry/core/_vendor/pyparsing.LICENSE;md5=fb46329938e6bc829b256e37d5c1e31a \ - file://poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=1211a1ac6eac40020d0f99c39b4e4270 \ - file://poetry/core/_vendor/six.LICENSE;md5=6a574656da93d9ef05431b45907e35b6 \ - file://poetry/core/_vendor/tomlkit/LICENSE;md5=be329e5ef9c9fe86738c9afe6ef3c11c \ - " - -SRC_URI[sha256sum] = "951fc7c1f8d710a94cb49019ee3742125039fc659675912ea614ac2aa405b118" - -inherit poetry_core pypi - -RDEPENDS:${PN}:append:class-target = "\ - python3-compression \ - python3-core \ - python3-crypt \ - python3-io \ - python3-json \ - python3-logging \ - python3-netclient \ - python3-pathlib2 \ - python3-pprint \ - python3-shell \ -" - -RDEPENDS:${PN} += "\ - python3-pip \ - python3-six \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb b/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb deleted file mode 100644 index 21d14a03b8d..00000000000 --- a/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A library for stubbing in Python" -HOMEPAGE = "https://github.com/alex/pretend" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=411780c0b7fa756753e94affeee5bc99" - -SRC_URI[md5sum] = "ad53883ede48aeac7ae584f0de0240e8" -SRC_URI[sha256sum] = "c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch b/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch deleted file mode 100644 index 34ea03b27f3..00000000000 --- a/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 8b4e38958ff8bdbb3ece4796bfa2d3b6f7536f71 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 23 Feb 2022 11:54:40 +0800 -Subject: [PATCH] fix failure test cases - -The test cases is not robust enough. skip some cases that is -not suitable for all conditions. - -* test_io_counters failed when kernel config CONFIG_TASKSTATS - and CONFIG_TASK_IO_ACCOUNTING are not enable in OE -* test_setup_script failed since oe don't install setup.py -* test_used failed since oe use git source for free, so the version - is 3.3.17-dirty -* test_weird_environ failed since gcc not installed -* test_debug failed since it is designed to run when PSUTIL_DEBUG is set -* test_against_findmnt/test_comparisons/test_disk_partitions_mocked/ - test_disk_partitions is not suitable for Linux nfs boot - -Upstream-Status: Pending - -Signed-off-by: Changqing Li ---- - psutil/tests/test_contracts.py | 1 + - psutil/tests/test_linux.py | 8 ++++++-- - psutil/tests/test_misc.py | 4 ++++ - psutil/tests/test_process.py | 5 +++++ - psutil/tests/test_system.py | 1 + - psutil/tests/test_unicode.py | 4 +++- - 6 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py -index 7401cc1..bf0fca0 100755 ---- a/psutil/tests/test_contracts.py -+++ b/psutil/tests/test_contracts.py -@@ -172,6 +172,7 @@ class TestAvailProcessAPIs(PsutilTestCase): - def test_rlimit(self): - self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD) - -+ @unittest.skip("broken on OE since kernel config maye not be enabled") - def test_io_counters(self): - hasit = hasattr(psutil.Process, "io_counters") - self.assertEqual(hasit, False if MACOS or SUNOS else True) -diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py -index 20e28d2..66b6dda 100755 ---- a/psutil/tests/test_linux.py -+++ b/psutil/tests/test_linux.py -@@ -196,8 +196,9 @@ def get_free_version_info(): - out = sh(["free", "-V"]).strip() - if 'UNKNOWN' in out: - raise unittest.SkipTest("can't determine free version") -- return tuple(map(int, out.split()[-1].split('.'))) -- -+ vlist = out.split()[-1].split('.') -+ vlist[:] = [n.split('-')[0] for n in vlist] -+ return tuple(map(int, vlist)) - - @contextlib.contextmanager - def mock_open_content(for_path, content): -@@ -1289,6 +1290,7 @@ class TestRootFsDeviceFinder(PsutilTestCase): - finder.ask_sys_class_block() - - @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS") -+ @unittest.skip("Broken for oe") - def test_comparisons(self): - finder = RootFsDeviceFinder() - self.assertIsNotNone(finder.find()) -@@ -1311,11 +1313,13 @@ class TestRootFsDeviceFinder(PsutilTestCase): - - @unittest.skipIf(not which("findmnt"), "findmnt utility not available") - @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS") -+ @unittest.skip("Broken for oe") - def test_against_findmnt(self): - psutil_value = RootFsDeviceFinder().find() - findmnt_value = sh("findmnt -o SOURCE -rn /") - self.assertEqual(psutil_value, findmnt_value) - -+ @unittest.skip("Broken for oe") - def test_disk_partitions_mocked(self): - with mock.patch( - 'psutil._pslinux.cext.disk_partitions', -diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py -index d946eb6..121004a 100755 ---- a/psutil/tests/test_misc.py -+++ b/psutil/tests/test_misc.py -@@ -54,6 +54,8 @@ from psutil.tests import unittest - # =================================================================== - - -+PSUTIL_DEBUG = bool(os.getenv('PSUTIL_DEBUG', 0)) -+ - class TestMisc(PsutilTestCase): - - def test_process__repr__(self, func=repr): -@@ -368,6 +370,7 @@ class TestMisc(PsutilTestCase): - - # XXX: https://github.com/pypa/setuptools/pull/2896 - @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug") -+ @unittest.skip("OE run this test outof source tree") - def test_setup_script(self): - setup_py = os.path.join(ROOT_DIR, 'setup.py') - if CI_TESTING and not os.path.exists(setup_py): -@@ -401,6 +404,7 @@ class TestMisc(PsutilTestCase): - reload_module(psutil) - self.assertIn("version conflict", str(cm.exception).lower()) - -+ @unittest.skipIf(not PSUTIL_DEBUG, "env PSUTIL_DEBUG not set") - def test_debug(self): - if PY3: - from io import StringIO -diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py -index c9059e3..a34ba3d 100755 ---- a/psutil/tests/test_process.py -+++ b/psutil/tests/test_process.py -@@ -36,6 +36,7 @@ from psutil._compat import PY3 - from psutil._compat import FileNotFoundError - from psutil._compat import long - from psutil._compat import super -+from psutil._compat import which - from psutil.tests import APPVEYOR - from psutil.tests import CI_TESTING - from psutil.tests import GITHUB_ACTIONS -@@ -726,6 +727,7 @@ class TestProcess(PsutilTestCase): - self.assertEqual(' '.join(p.cmdline()), ' '.join(cmdline)) - - @unittest.skipIf(PYPY, "broken on PYPY") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_long_cmdline(self): - testfn = self.get_testfn() - create_exe(testfn) -@@ -740,6 +742,7 @@ class TestProcess(PsutilTestCase): - assert pyexe.startswith(name), (pyexe, name) - - @unittest.skipIf(PYPY, "unreliable on PYPY") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_long_name(self): - testfn = self.get_testfn(suffix="0123456789" * 2) - create_exe(testfn) -@@ -750,6 +753,7 @@ class TestProcess(PsutilTestCase): - @unittest.skipIf(SUNOS, "broken on SUNOS") - @unittest.skipIf(AIX, "broken on AIX") - @unittest.skipIf(PYPY, "broken on PYPY") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_prog_w_funky_name(self): - # Test that name(), exe() and cmdline() correctly handle programs - # with funky chars such as spaces and ")", see: -@@ -1408,6 +1412,7 @@ class TestProcess(PsutilTestCase): - - @unittest.skipIf(not HAS_ENVIRON, "not supported") - @unittest.skipIf(not POSIX, "POSIX only") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_weird_environ(self): - # environment variables can contain values without an equals sign - code = textwrap.dedent(""" -diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py -index db2cb34..5ee519f 100755 ---- a/psutil/tests/test_system.py -+++ b/psutil/tests/test_system.py -@@ -580,6 +580,7 @@ class TestDiskAPIs(PsutilTestCase): - def test_disk_usage_bytes(self): - psutil.disk_usage(b'.') - -+ @unittest.skip("Broken for oe") - def test_disk_partitions(self): - def check_ntuple(nt): - self.assertIsInstance(nt.device, str) -diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py -index e635726..7ba5b0f 100755 ---- a/psutil/tests/test_unicode.py -+++ b/psutil/tests/test_unicode.py -@@ -86,6 +86,7 @@ from psutil import POSIX - from psutil import WINDOWS - from psutil._compat import PY3 - from psutil._compat import u -+from psutil._compat import which - from psutil.tests import APPVEYOR - from psutil.tests import ASCII_FS - from psutil.tests import CI_TESTING -@@ -156,7 +157,7 @@ def try_unicode(suffix): - # FS APIs - # =================================================================== - -- -+@unittest.skipIf(not which("gcc"), "gcc not installed") - class BaseUnicodeTest(PsutilTestCase): - funky_suffix = None - -@@ -169,6 +170,7 @@ class BaseUnicodeTest(PsutilTestCase): - @serialrun - @unittest.skipIf(ASCII_FS, "ASCII fs") - @unittest.skipIf(PYPY and not PY3, "too much trouble on PYPY2") -+@unittest.skipIf(not which("gcc"), "gcc not installed") - class TestFSAPIs(BaseUnicodeTest): - """Test FS APIs with a funky, valid, UTF8 path name.""" - --- -2.25.1 - diff --git a/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb b/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb deleted file mode 100644 index 3df0e5d003e..00000000000 --- a/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "A cross-platform process and system utilities module for Python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" - -SRC_URI[sha256sum] = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25" - -inherit pypi setuptools3 - -SRC_URI += "file://0001-fix-failure-test-cases.patch" - -PACKAGES =+ "${PN}-tests" - -FILES:${PN}-tests += " \ - ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \ - ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \ -" - - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-resource \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pycparser_2.21.bb b/meta-python/recipes-devtools/python/python3-pycparser_2.21.bb deleted file mode 100644 index 53b7367903e..00000000000 --- a/meta-python/recipes-devtools/python/python3-pycparser_2.21.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Parser of the C language, written in pure Python" -HOMEPAGE = "https://github.com/eliben/pycparser" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea" - -SRC_URI[sha256sum] = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pprint \ - " - -RSUGGESTS:${PN}:class-target += "\ - cpp \ - cpp-symlinks \ - " diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.155.1.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.4.155.1.bb index ef18671a0a5..613a009d432 100644 --- a/meta-python/recipes-devtools/python/python3-pymisp_2.4.155.1.bb +++ b/meta-python/recipes-devtools/python/python3-pymisp_2.4.155.1.bb @@ -7,7 +7,7 @@ SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main" SRCREV = "03dc22f9598e6caae81b0e40ce27bf3f17799f4e" S = "${WORKDIR}/git" -inherit poetry_core +inherit python_poetry_core PIP_INSTALL_PACKAGE = "pymisp" diff --git a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb b/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb index 665aaf38bd6..b2d0dc324b2 100644 --- a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb +++ b/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb @@ -6,4 +6,4 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665 PYPI_PACKAGE = "pyrad" SRC_URI[sha256sum] = "057de4b7e89d8da57ba782c1bde45c63ebee720ae2c0b0a69beaff15c47e30d9" -inherit pypi poetry_core +inherit pypi python_poetry_core 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 143125bbb18..97fce690ec8 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 @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "10befedd97e73fc18b902d02aa3b24e8978aa162242c1b664849c886c0 S = "${WORKDIR}/pyruvate-${PV}" -inherit pypi setuptools3_rust +inherit pypi python_setuptools3_rust PIP_INSTALL_DIST_PATH = "${S}/dist" diff --git a/meta-python/recipes-devtools/python/python3-pytest-subtests_0.6.0.bb b/meta-python/recipes-devtools/python/python3-pytest-subtests_0.6.0.bb deleted file mode 100644 index 5e4847b8d94..00000000000 --- a/meta-python/recipes-devtools/python/python3-pytest-subtests_0.6.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "unittest subTest() support and subtests fixture." -DESCRIPTION = "Adds support for TestCase.subTest.\ -New subtests fixture, providing similar functionality for pure pytest tests." -HOMEPAGE = "https://github.com/pytest-dev/pytest-subtests" -BUGTRACKER = "https://github.com/pytest-dev/pytest-subtests/issues" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=242b4e17fa287dcf7aef372f6bc3dcb1" - -SRC_URI[sha256sum] = "3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pytz/run-ptest b/meta-python/recipes-devtools/python/python3-pytz/run-ptest deleted file mode 100644 index b63c4de0d9a..00000000000 --- a/meta-python/recipes-devtools/python/python3-pytz/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/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-pytz_2021.3.bb b/meta-python/recipes-devtools/python/python3-pytz_2021.3.bb deleted file mode 100644 index 119342a4bd7..00000000000 --- a/meta-python/recipes-devtools/python/python3-pytz_2021.3.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "World timezone definitions, modern and historical" -HOMEPAGE = "http://pythonhosted.org/pytz" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" - -inherit pypi setuptools3 ptest - -SRC_URI[sha256sum] = "acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326" - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/pytz - install -d ${D}${PTEST_PATH}/pytz/tests - cp -rf ${S}/pytz/tests/* ${D}${PTEST_PATH}/pytz/tests/ - cp -f ${S}/README.rst ${D}${PTEST_PATH}/ - -} diff --git a/meta-python/recipes-devtools/python/python3-rsa_4.8.bb b/meta-python/recipes-devtools/python/python3-rsa_4.8.bb index 7e572a933dc..21b664ddd1c 100644 --- a/meta-python/recipes-devtools/python/python3-rsa_4.8.bb +++ b/meta-python/recipes-devtools/python/python3-rsa_4.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" SRC_URI[sha256sum] = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17" -inherit pypi poetry_core update-alternatives +inherit pypi python_poetry_core update-alternatives ALTERNATIVE:${PN} = "\ pyrsa-decrypt \ diff --git a/meta-python/recipes-devtools/python/python3-semantic-version_2.9.0.bb b/meta-python/recipes-devtools/python/python3-semantic-version_2.9.0.bb deleted file mode 100644 index ee635871bf5..00000000000 --- a/meta-python/recipes-devtools/python/python3-semantic-version_2.9.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A library implementing the 'SemVer' scheme." -DESCRIPTION = "Semantic version comparison for Python (see http://semver.org/)" -HOMEPAGE = "https://github.com/rbarrois/python-semanticversion" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fb31e3c1c7eeb8b5e8c07657cdd54e2" - -SRC_URI[sha256sum] = "abf54873553e5e07a6fd4d5f653b781f5ae41297a493666b59dcf214006a12b2" - -PYPI_PACKAGE = "semantic_version" -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" 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 deleted file mode 100644 index 73dcbb26e67..00000000000 --- a/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Setuptools Rust extension plugin" -DESCRIPTION = "setuptools-rust is a plugin for setuptools to build Rust \ -Python extensions implemented with PyO3 or rust-cpython.\ -\ -Compile and distribute Python extensions written in Rust as easily as if they were written in C." -HOMEPAGE = "https://github.com/PyO3/setuptools-rust" -BUGTRACKER = "https://github.com/PyO3/setuptools-rust/issues" - -LICENSE = "MIT" -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" -PIP_INSTALL_PACKAGE = "setuptools_rust" - -DEPENDS += "python3-setuptools-scm-native python3-wheel-native" - -RDEPENDS:${PN}:class-native += " \ - python3-semantic-version-native \ - python3-setuptools-native \ - python3-setuptools-scm-native \ - python3-toml-native \ - python3-typing-extensions-native \ - python3-wheel-native \ -" diff --git a/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb b/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb deleted file mode 100644 index a5f491c7700..00000000000 --- a/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -HOMEPAGE = "https://github.com/python/typing" -LICENSE = "PSF-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" - -# The name on PyPi is slightly different. -PYPI_PACKAGE = "typing_extensions" - -SRC_URI[sha256sum] = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk"