[meta-python][PATCH v2 0/3] python3-prettytable update; fix ptests

[meta-python][PATCH v2 0/3] python3-prettytable update; fix ptests

[Tim Orling]

The prior version did not run any ptests, since the test_prettytable.py was
not discovered by pytest. Also, since python3-pytest upgrade to 8.0.0 the
python3-pytest-lazy-fixture module was non-functional.

* Add python3-pytest-lazy-fixtures (with the s)
* Upgrade to the latest python3-prettytable 3.10.0
* Drop python3-pytest-lazy-fixture (without the s)

All the ptests for meta-python-image-ptest-python3-prettytable pass on qemux86-64:

$ resulttool report build/tmp/log/oeqa/testresults.json
==============================================================================================================
Test Result Status Summary (Counts/Percentages sorted by testseries, ID)
==============================================================================================================
--------------------------------------------------------------------------------------------------------------
Test Series | ID                                                                     | Passed    | Failed | Skipped
--------------------------------------------------------------------------------------------------------------
oeqa | runtime_meta-python-image-ptest-python3-prettytable_qemux86-64_20240220002104 | 171 (99%) | 0 (0%) | 1 (1%)
--------------------------------------------------------------------------------------------------------------
Total | 1                                                                            | 171       | 0      | 1
--------------------------------------------------------------------------------------------------------------

==============================================================================================================
qemux86-64 PTest Result Summary
==============================================================================================================
--------------------------------------------------------------------------------------------------------------
Recipe              | Passed    | Failed | Skipped | Time(s)
--------------------------------------------------------------------------------------------------------------
python3-prettytable | 166       | 0      | 0      | 0
--------------------------------------------------------------------------------------------------------------

The following changes since commit bd9086015b1485d8b16d91954f9140901fd9a0fb:

  meta-gnome: drop ${PYTHON_PN} (2024-02-19 19:57:38 -0800)

are available in the Git repository at:

  https://git.openembedded.org/meta-openembedded-contrib timo/python3-prettytable-update
  https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python3-prettytable-update

Tim Orling (3):
  python3-pytest-lazy-fixtures: add 1.0.5
  python3-prettytable: upgrade 3.9.0 => 3.10.0; fix ptests
  python3-pytest-lazy-fixture: drop recipe

 .../ptest-packagelists-meta-python.inc        |  1 -
 .../packagegroups/packagegroup-meta-python.bb |  3 +-
 ...3.9.0.bb => python3-prettytable_3.10.0.bb} | 33 ++++++++++---------
 .../python3-pytest-lazy-fixture/run-ptest     |  3 --
 .../python3-pytest-lazy-fixture_0.6.3.bb      | 26 ---------------
 .../python3-pytest-lazy-fixtures_1.0.5.bb     | 21 ++++++++++++
 6 files changed, 39 insertions(+), 48 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-prettytable_3.9.0.bb => python3-prettytable_3.10.0.bb} (67%)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest
 delete mode 100644 meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb
 create mode 100644 meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb

-- 
2.34.1

[meta-python][PATCH v2 1/3] python3-pytest-lazy-fixtures: add 1.0.5

[Tim Orling]

Use your fixtures in @pytest.mark.parametrize.

This project was inspired by pytest-lazy-fixture.

Improvements that have been made in this project:

1. You can use fixtures in any data structures
2. You can access the attributes of fixtures
3. You can use functions in fixtures

* Dependency for python3-prettytable ptest.
  (Not the same as python3-pytest-lazy-fixture without the s)
* Upstream does not package tests/ in the sdist on pypi, so
  we do not try to enable ptest at this time (it would require
  using git fetcher instead of pypi.bbclass).
* The ptest for the predecessor (python3-pytest-lazy-fixture
  without the s) was already in PTEST_PROBLEMS, meaning its
  ptests did not run cleanly.

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
Changes in v2:
Rebased on top of rebased timo/drop-PYTHON_PN on top of master-next

 .../python3-pytest-lazy-fixtures_1.0.5.bb     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb

diff --git a/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb b/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb
new file mode 100644
index 0000000000..dcf662a2c8
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Allows you to use fixtures in @pytest.mark.parametrize."
+DESCRIPTION = "Use your fixtures in @pytest.mark.parametrize. \
+\
+This project was inspired by pytest-lazy-fixture.\
+\
+Improvements that have been made in this project:\
+\
+* You can use fixtures in any data structures\
+* You can access the attributes of fixtures\
+* You can use functions in fixtures"
+HOMEPAGE = "https://github.com/dev-petrov/pytest-lazy-fixtures"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4475e66fcfabe27395e6764c8f69c876"
+
+SRC_URI[sha256sum] = "066b253a94c249e6d9cdfad465e2503d2219139fb468d8f687243dfde39ab9cb"
+
+inherit pypi python_poetry_core
+
+PYPI_PACKAGE = "pytest_lazy_fixtures"
+
+RDEPENDS:${PN} = "python3-pytest"
-- 
2.34.1

[meta-python][PATCH v2 2/3] python3-prettytable: upgrade 3.9.0 => 3.10.0; fix ptests

[Tim Orling]

* Add all tests/* to be more complete and also to help
  pytest find the tests (previously, no test cases were
  actually being run)
* Sort RDEPENDS alphabetically
* ptest now RDEPENDS on python3-pytest-lazy-fixtures (with the s)
  instead of python3-pytest-lazy-fixture (without the s) because
  of python3-pytest 8.0.0 compatability.
* Rearrange the recipe a bit

https://github.com/jazzband/prettytable/releases/tag/3.10.0

Added
* Add support for Python 3.13 (#281) @hugovk

Changed
* Speedup: lazy imports and remove import (#276) @hugovk
* Use GitHub Flavored Markdown for table formatting (#268) @mumblingMac
* Use flake8-errmsg for friendlier tracebacks (#254) @hugovk
* Replace Flake8 with Ruff (#278) @hugovk

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
Changes in v2:
Rebased on top of rebased timo/drop-PYTHON_PN on top of master-next

 ...3.9.0.bb => python3-prettytable_3.10.0.bb} | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-prettytable_3.9.0.bb => python3-prettytable_3.10.0.bb} (67%)

diff --git a/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb b/meta-python/recipes-devtools/python/python3-prettytable_3.10.0.bb
similarity index 67%
rename from meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb
rename to meta-python/recipes-devtools/python/python3-prettytable_3.10.0.bb
index ba75057f59..35e9ab1798 100644
--- a/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb
+++ b/meta-python/recipes-devtools/python/python3-prettytable_3.10.0.bb
@@ -3,7 +3,12 @@ HOMEPAGE = "http://code.google.com/p/prettytable"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671"
 
-SRC_URI[sha256sum] = "f4ed94803c23073a90620b201965e5dc0bccf1760b7a7eaf3158cab8aaffdf34"
+
+SRC_URI[sha256sum] = "9665594d137fb08a1117518c25551e0ede1687197cf353a4fdc78d27e1073568"
+SRC_URI += " \
+	file://run-ptest \
+"
+inherit pypi ptest python_hatchling
 
 do_install:append() {
     perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"`
@@ -12,33 +17,29 @@ do_install:append() {
     done
 }
 
-BBCLASSEXTEND = "native nativesdk"
-inherit pypi ptest python_hatchling
-
-SRC_URI += " \
-	file://run-ptest \
-"
-
 DEPENDS += "\
     python3-hatch-vcs-native \
 "
 
 RDEPENDS:${PN} += " \
-	python3-math \
-	python3-html \
-	python3-wcwidth \
-	python3-json \
-	python3-compression \
-	python3-importlib-metadata \
+    python3-compression \
+    python3-html \
+    python3-importlib-metadata \
+    python3-json \
+    python3-math \
+    python3-wcwidth \
 "
 
 RDEPENDS:${PN}-ptest += " \
     python3-pytest \
-    python3-pytest-lazy-fixture \
+    python3-pytest-lazy-fixtures \
     python3-sqlite3 \
     python3-unittest-automake-output \
 "
 
 do_install_ptest() {
-	cp -f ${S}/tests/test_prettytable.py ${D}${PTEST_PATH}/
+     install -d ${D}${PTEST_PATH}/tests
+     cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
 }
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1

[meta-python][PATCH v2 3/3] python3-pytest-lazy-fixture: drop recipe

[Tim Orling]

This recipe is no longer maintained (since 2020) and is not compliant with python3-pytest_8.0.0+.

The only dependency in meta-python was the old version of python3-prettytable-ptest, which now
RDEPENDS upon python3-pytest-lazy-fixtures (with the s).

* Drop the recipe
* Drop it from packagegroup-meta-python
* Drop it from PTEST_PROBLEMS in ptest-packagelists-meta-python.inc

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
Changes in v2:
Rebased on top of rebased timo/drop-PYTHON_PN on top of master-next

 .../ptest-packagelists-meta-python.inc        |  1 -
 .../packagegroups/packagegroup-meta-python.bb |  3 +--
 .../python3-pytest-lazy-fixture/run-ptest     |  3 ---
 .../python3-pytest-lazy-fixture_0.6.3.bb      | 26 -------------------
 4 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest
 delete mode 100644 meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb

diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc
index fe8f07c851..a9349345bb 100644
--- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
+++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
@@ -80,7 +80,6 @@ PTESTS_PROBLEMS_META_PYTHON ="\
     python3-ordered-set \
     python3-pillow \
     python3-pint \
-    python3-pytest-lazy-fixture \
     python3-pyzmq \
     python3-scrypt \
     python3-service-identity \
diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 41fce53274..eb5a264631 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -348,7 +348,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-pytest-forked \
     python3-pytest-helpers-namespace \
     python3-pytest-html \
-    python3-pytest-lazy-fixture \
+    python3-pytest-lazy-fixtures \
     python3-pytest-metadata \
     python3-pytest-tempdir \
     python3-pytest-timeout \
@@ -507,7 +507,6 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\
     python3-pyasn1-modules-ptest \
     python3-pyroute2-ptest \
     python3-pyserial-ptest \
-    python3-pytest-lazy-fixture-ptest \
     python3-pytoml-ptest \
     python3-pyzmq-ptest \
     python3-requests-file-ptest \
diff --git a/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest
deleted file mode 100644
index 8d2017d39c..0000000000
--- a/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
diff --git a/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb b/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb
deleted file mode 100644
index 9c50528fb0..0000000000
--- a/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2022 Wind River Systems
-
-SUMMARY = "Use your fixtures in @pytest.mark.parametrize."
-HOMEPAGE = "https://github.com/tvorog/pytest-lazy-fixture"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=aae6f2b7c9b3ced83e0b5bb42346d4dd"
-
-SRC_URI[sha256sum] = "0e7d0c7f74ba33e6e80905e9bfd81f9d15ef9a790de97993e34213deb5ad10ac"
-
-SRC_URI += "file://run-ptest \
-           "
-
-
-inherit ptest pypi setuptools3
-
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
-
-RDEPENDS:${PN} += "python3-core python3-pytest"
-RDEPENDS:${PN}-ptest = " \
-    python3-unixadmin \
-    python3-unittest-automake-output \
-    "
-- 
2.34.1