Skip to contentSkip to conversation

python3-pyroute2: update recipe to use the ptest-python-pytest class

PATCH In review Derek Straka 2 participants 11 messages Jan 17, 2025 – Jan 24, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/10 python3-pyroute2: update recipe to use the ptest-python-pytest class

---
 .../recipes-devtools/python/python3-pyroute2/run-ptest |  4 ----
 .../recipes-devtools/python/python3-pyroute2_0.8.1.bb  | 10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyroute2/run-ptest
meta-python/recipes-devtools/python/python3-pyroute2/run-ptest deleted +0 -4
deleted file mode 100644
index f1c8729f0..000000000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-pytest --automake
-
meta-python/recipes-devtools/python/python3-pyroute2_0.8.1.bb +2 -8
index 048b0ca07..8f5ec7fcb 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dccbff78d7d79ae7e53953d43445c6e6 \
 
 SRC_URI[sha256sum] = "b91f4a1f7abb9824637b1fe67e6e4a0a071d98d4a1a1b47ef792304ff3adad11"
 
-inherit python_setuptools_build_meta pypi ptest
+inherit python_setuptools_build_meta pypi ptest-python-pytest
 
 RDEPENDS:${PN} += " \
     python3-ctypes \
@@ -22,20 +22,14 @@ RDEPENDS:${PN} += " \
     python3-unixadmin \
 "
 
-SRC_URI += " \
-    file://run-ptest \
-"
-
 RDEPENDS:${PN}-ptest += " \
     python3-fcntl \
     python3-html \
     python3-netclient \
-    python3-pytest \
     python3-sqlite3 \
-    python3-unittest-automake-output \
 "
 
-do_install_ptest() {
+do_install_ptest:append () {
     install -d ${D}${PTEST_PATH}/tests
     cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
     sed -e  "s|'test_unit|'tests/test_unit|g" -i  ${D}${PTEST_PATH}/tests/test_unit/test_nlmsg/test_marshal.py \
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/10 python3-pydantic: update recipe to use the ptest-python-pytest class

---
 .../recipes-devtools/python/python3-pydantic/run-ptest    | 3 ---
 .../recipes-devtools/python/python3-pydantic_2.10.5.bb    | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pydantic/run-ptest
meta-python/recipes-devtools/python/python3-pydantic/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-pydantic_2.10.5.bb +2 -6
index 019781d51..cf211972d 100644
@@ -9,7 +9,7 @@ HOMEPAGE = "https://github.com/samuelcolvin/pydantic"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6"
 
-inherit pypi python_hatchling
+inherit pypi python_hatchling ptest-python-pytest
 
 SRC_URI[sha256sum] = "278b38dbbaec562011d659ee05f63346951b3a248a6f3642e1bc68894ea2b4ff" 
 
@@ -35,8 +35,6 @@ RDEPENDS:${PN} += "\
     python3-zoneinfo \
 "
 
-inherit ptest
-SRC_URI += "file://run-ptest"
 RDEPENDS:${PN}-ptest += "\
     python3-ansi2html \
     python3-coverage \
@@ -50,17 +48,15 @@ RDEPENDS:${PN}-ptest += "\
     python3-mypy \
     python3-packaging \
     python3-pydoc \
-    python3-pytest \
     python3-pytest-codspeed \
     python3-pytest-mock \
     python3-pytz \
     python3-rich \
     python3-sqlalchemy \
-    python3-unittest-automake-output \
     python3-unixadmin \
 "
 
-do_install_ptest() {
+do_install_ptest:append() {
     cp -rf ${S}/tests/ ${D}${PTEST_PATH}/
     # Requires 'ruff' (python3-ruff) which we cannot build
     # until we have Rust 1.71+ in oe-core
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/10 python3-pydantic-core: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-pydantic-core/run-ptest               | 3 ---
 .../python/python3-pydantic-core_2.27.2.bb               | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pydantic-core/run-ptest
meta-python/recipes-devtools/python/python3-pydantic-core/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-pydantic-core_2.27.2.bb +2 -7
index 52571ff2c..5dd76f99f 100644
@@ -10,13 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c"
 
 require ${BPN}-crates.inc
 
-SRC_URI += "file://run-ptest"
-
 SRC_URI[sha256sum] = "eb026e5a4c1fee05726072337ff51d1efb6f59090b7da90d30ea58625b1ffb39"
 
 DEPENDS = "python3-maturin-native python3-typing-extensions"
 
-inherit pypi cargo-update-recipe-crates python_maturin
+inherit pypi cargo-update-recipe-crates python_maturin ptest-python-pytest
 
 PYPI_PACKAGE = "pydantic_core"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
@@ -30,23 +28,20 @@ INSANE_SKIP:${PN} = "already-stripped"
 INSANE_SKIP:${PN} += "buildpaths"
 
 # python3-misc is for Lib/timeit.py which is not split out elsewhere
-inherit ptest
 RDEPENDS:${PN}-ptest += "\
 	python3-dateutil \
     python3-dirty-equals \
     python3-hypothesis \
     python3-inline-snapshot \
     python3-misc \
-    python3-pytest \
     python3-pytest-mock \
     python3-pytest-timeout \
     python3-pytest-benchmark \
 	python3-tzdata \
-    python3-unittest-automake-output \
 	python3-zoneinfo \
 "
 
-do_install_ptest() {
+do_install_ptest:append () {
     cp -rf ${S}/tests/ ${D}${PTEST_PATH}/
     sed -i -e "/--automake/ s/$/ -k 'not test_model_class_root_validator_wrap and not test_model_class_root_validator_before and not test_model_class_root_validator_after'/" ${D}${PTEST_PATH}/run-ptest
 }
Signature · 1 line
2.34.1
#3 lore raw

PATCH 4/10 python3-pyasn1-modules: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-pyasn1-modules/run-ptest       |  3 ---
 .../python/python3-pyasn1-modules_0.4.1.bb        | 15 +--------------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest
meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.1.bb +1 -14
index 225da562c..0ef2eaa1d 100644
@@ -12,22 +12,9 @@ SRC_URI[sha256sum] = "c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2a
 PYPI_PACKAGE = "pyasn1_modules"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 
-inherit pypi ptest python_setuptools_build_meta
+inherit pypi ptest-python-pytest python_setuptools_build_meta
 
 RDEPENDS:${PN} = "python3-pyasn1"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI += " \
-	file://run-ptest \
-"
-
-RDEPENDS:${PN}-ptest += " \
-    python3-pytest \
-    python3-unittest-automake-output \
-"
-
-do_install_ptest() {
-	install -d ${D}${PTEST_PATH}/tests
-	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
Signature · 1 line
2.34.1
#4 lore raw

PATCH 5/10 python3-py-cpuinfo: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-py-cpuinfo/run-ptest               |  3 ---
 .../python/python3-py-cpuinfo_9.0.0.bb                | 11 ++---------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest
meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb +2 -9
index 2d59a99b1..8aef266e3 100644
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2379ecb0d7a8299101b1e4c160cd1f7"
 
 SRC_URI[sha256sum] = "3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690"
 
-inherit ptest pypi python_setuptools_build_meta
+inherit ptest-python-pytest pypi python_setuptools_build_meta
 
-SRC_URI += "file://run-ptest \
+SRC_URI += " \
             file://0001-test_cli.py-disable.patch \
            "
 
@@ -21,15 +21,8 @@ do_install:append() {
     done
 }
 
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
 RDEPENDS:${PN}-ptest += "\
     python3-compile \
-    python3-pytest \
-    python3-unittest-automake-output \
 "
 
 RDEPENDS:${PN} += "python3-core python3-ctypes python3-datetime python3-json python3-io python3-mmap python3-multiprocessing python3-netclient python3-pickle python3-pprint python3-shell"
Signature · 1 line
2.34.1
#5 lore raw

PATCH 6/10 python3-ptyprocess: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-ptyprocess/run-ptest            |  3 ---
 .../python/python3-ptyprocess_0.7.0.bb             | 14 +-------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest
meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb +1 -13
index 12f10d824..e63c2c50b 100644
@@ -9,7 +9,7 @@ SRCNAME = "ptyprocess"
 SRC_URI += "file://a44312974bd9084aa568d2e18ce5b2a7e0e45983.patch"
 SRC_URI[sha256sum] = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"
 
-inherit pypi python_flit_core
+inherit pypi python_flit_core ptest-python-pytest
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -22,22 +22,10 @@ RDEPENDS:${PN} = "\
 
 BBCLASSEXTEND = "native nativesdk"
 
-inherit ptest
-
-SRC_URI += " \
-	file://run-ptest \
-"
-
 RDEPENDS:${PN}-ptest += " \
     bash \
     python3-fcntl \
-    python3-pytest \
     python3-resource \
     python3-terminal \
-    python3-unittest-automake-output \
 "
 
-do_install_ptest() {
-	install -d ${D}${PTEST_PATH}/tests
-	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
Signature · 1 line
2.34.1
#6 lore raw

PATCH 7/10 python3-propcache: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-propcache/run-ptest               |  3 ---
 .../python/python3-propcache_0.2.1.bb                | 12 +-----------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-propcache/run-ptest
meta-python/recipes-devtools/python/python3-propcache/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-propcache_0.2.1.bb +1 -11
index 0ea24e8bc..d15ead920 100644
@@ -5,26 +5,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI[sha256sum] = "3f77ce728b19cb537714499928fe800c3dda29e8d9428778fc7c186da4c09a64"
 
-inherit pypi python_setuptools_build_meta ptest cython
-
-SRC_URI += " \
-	file://run-ptest \
-"
+inherit pypi python_setuptools_build_meta ptest-python-pytest cython
 
 DEPENDS += " \
 	python3-expandvars-native \
 "
 
 RDEPENDS:${PN}-ptest += " \
-	python3-pytest \
 	python3-pytest-codspeed \
 	python3-pytest-xdist \
 	python3-rich \
 	python3-statistics \
-	python3-unittest-automake-output \
 "
 
-do_install_ptest() {
-	install -d ${D}${PTEST_PATH}/tests
-	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
Signature · 1 line
2.34.1
#7 lore raw

PATCH 8/10 python3-prettytable: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-prettytable/run-ptest            |  3 ---
 .../python/python3-prettytable_3.12.0.bb            | 13 ++-----------
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-prettytable/run-ptest
meta-python/recipes-devtools/python/python3-prettytable/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-prettytable_3.12.0.bb +2 -11
index 442aadda2..007c0bffa 100644
@@ -5,10 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671"
 
 
 SRC_URI[sha256sum] = "f04b3e1ba35747ac86e96ec33e3bb9748ce08e254dc2a1c6253945901beec804"
-SRC_URI += " \
-	file://run-ptest \
-"
-inherit pypi ptest python_hatchling
+
+inherit pypi ptest-python-pytest  python_hatchling
 
 do_install:append() {
     perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"`
@@ -31,15 +29,8 @@ RDEPENDS:${PN} += " \
 "
 
 RDEPENDS:${PN}-ptest += " \
-    python3-pytest \
     python3-pytest-lazy-fixtures \
     python3-sqlite3 \
-    python3-unittest-automake-output \
 "
 
-do_install_ptest() {
-     install -d ${D}${PTEST_PATH}/tests
-     cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.34.1
#8 lore raw

PATCH 9/10 python3-precise-runner: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-precise-runner/run-ptest      |  3 ---
 .../python/python3-precise-runner_0.3.1.bb       | 16 ++--------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-precise-runner/run-ptest
meta-python/recipes-devtools/python/python3-precise-runner/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb +2 -14
index ea453366a..53fc31ab8 100644
@@ -5,18 +5,6 @@ LIC_FILES_CHKSUM = "file://README.md;md5=2ad29e930f3107d52d2a55728bf62116"
 
 SRC_URI[sha256sum] = "1a464209fb4bf0a3f5d5a428310cb2a70487a01a6bc3a960d1dda90af896b80d"
 
-inherit pypi setuptools3 ptest
+inherit pypi setuptools3 ptest-python-pytest
 
-SRC_URI += " \
-	file://run-ptest \
-"
-
-RDEPENDS:${PN}-ptest += " \
-    python3-pytest \
-    python3-unittest-automake-output \
-"
-
-do_install_ptest() {
-	install -d ${D}${PTEST_PATH}/test
-	cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/
-}
+PTEST_PYTEST_DIR = "test"
Signature · 1 line
2.34.1
#9 lore raw

PATCH 10/10 python3-portion: update recipe to use the ptest-python-pytest class

In reply to Derek Straka
---
 .../python/python3-portion/run-ptest            |  3 ---
 .../python/python3-portion_2.6.0.bb             | 17 +++--------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-portion/run-ptest
meta-python/recipes-devtools/python/python3-portion/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-portion_2.6.0.bb +3 -14
index 31c6f0731..8bdbc032c 100644
@@ -5,28 +5,17 @@ SECTION = "devel/python"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
 
-inherit pypi python_setuptools_build_meta ptest
+inherit pypi python_setuptools_build_meta ptest-python-pytest
 
 SRC_URI[sha256sum] = "6fb538b57a92058f0edd360667694448aa3fc028ab97e41e3091359d14ba4dd5"
 
-SRC_URI += " \
-	file://run-ptest \
-"
-
 RDEPENDS:${PN} += "\
 	python3-sortedcontainers \
 "
 
-RDEPENDS:${PN}-ptest += " \
-	python3-pytest \
-	python3-unittest-automake-output \
-"
-
-do_install_ptest() {
-	install -d ${D}${PTEST_PATH}/tests
+do_install_ptest:append () {
 	# This file tests README.md and deleted as redundant.
-	rm -f ${S}/tests/test_doc.py
-	cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+	rm -f ${D}/tests/test_doc.py
 }
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.34.1
#10 lore raw

Re: [oe][meta-python][PATCH 10/10] python3-portion: update recipe to use the ptest-python-pytest class

Quoted 42 lines · Derek Straka via lists.openembedded.org
---
 .../python/python3-portion/run-ptest            |  3 ---
 .../python/python3-portion_2.6.0.bb             | 17 +++--------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-portion/run-ptest
meta-python/recipes-devtools/python/python3-portion/run-ptest deleted +0 -3
deleted file mode 100644
index 8d2017d39..000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
meta-python/recipes-devtools/python/python3-portion_2.6.0.bb +1 -9
index 31c6f0731..8bdbc032c 100644
@@ -5,28 +5,17 @@ SECTION = "devel/python"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
 
-inherit pypi python_setuptools_build_meta ptest
+inherit pypi python_setuptools_build_meta ptest-python-pytest
 
 SRC_URI[sha256sum] = "6fb538b57a92058f0edd360667694448aa3fc028ab97e41e3091359d14ba4dd5"
 
-SRC_URI += " \
-       file://run-ptest \
-"
-
 RDEPENDS:${PN} += "\
        python3-sortedcontainers \
 "
 
-RDEPENDS:${PN}-ptest += " \
-       python3-pytest \
-       python3-unittest-automake-output \
-"

meta-python/recipes-devtools/python/python3-portion_2.6.0.bb SECTION = "devel/python" · line 20

Quoted 10 lines
meta-python/recipes-devtools/python/python3-portion_2.6.0.bb +2 -5
-
-do_install_ptest() {
-       install -d ${D}${PTEST_PATH}/tests
+do_install_ptest:append () {
        # This file tests README.md and deleted as redundant.
-       rm -f ${S}/tests/test_doc.py
-       cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+       rm -f ${D}/tests/test_doc.py
 }
 

It causes a ptest failure.

Failed ptests:
{'python3-portion': ['tests/test_doc.py:test_readme']}

I think removing test_doc.py needs to be fixed to work as it was, or perhaps package README.md so it can pass.

Quoted 13 lines
meta-python/recipes-devtools/python/python3-portion_2.6.0.bb +0 -1
 BBCLASSEXTEND = "native"
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#114943): https://lists.openembedded.org/g/openembedded-devel/message/114943
Mute This Topic: https://lists.openembedded.org/mt/110673713/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-