[PATCH 0/2] Fix for python3-pytest 8.0.0 related failure

[PATCH 0/2] Fix for python3-pytest 8.0.0 related failure

[Tim Orling]

The python3-pytest upgrade to 8.0.0 caused a failure in python3-attrs.
https://github.com/python-attrs/attrs/issues/1233

Tim Orling (1):
  python3-attrs: skip test failing with pytest-8

Wang Mingyu (1):
  python3-pytest: upgrade 7.4.4 -> 8.0.0

 ...funcs-skip-test_unknown-for-pytest-8.patch | 30 +++++++++++++++++++
 .../python/python3-attrs_23.2.0.bb            |  1 +
 ...ytest_7.4.4.bb => python3-pytest_8.0.0.bb} |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python3-attrs/0001-test_funcs-skip-test_unknown-for-pytest-8.patch
 rename meta/recipes-devtools/python/{python3-pytest_7.4.4.bb => python3-pytest_8.0.0.bb} (93%)

-- 
2.34.1

[PATCH 1/2] python3-pytest: upgrade 7.4.4 -> 8.0.0

[Tim Orling]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
=============
#11842: Properly escape the reason of a skip mark when writing JUnit XML files.
#11861: Avoid microsecond exceeds 1_000_000 when using log-date-format with
 %f specifier, which might cause the test suite to crash.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../python/{python3-pytest_7.4.4.bb => python3-pytest_8.0.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pytest_7.4.4.bb => python3-pytest_8.0.0.bb} (93%)

diff --git a/meta/recipes-devtools/python/python3-pytest_7.4.4.bb b/meta/recipes-devtools/python/python3-pytest_8.0.0.bb
similarity index 93%
rename from meta/recipes-devtools/python/python3-pytest_7.4.4.bb
rename to meta/recipes-devtools/python/python3-pytest_8.0.0.bb
index 18062c8fb85..994f6cbdaf5 100644
--- a/meta/recipes-devtools/python/python3-pytest_7.4.4.bb
+++ b/meta/recipes-devtools/python/python3-pytest_8.0.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c"
 
-SRC_URI[sha256sum] = "2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280"
+SRC_URI[sha256sum] = "249b1b0864530ba251b7438274c4d251c58d868edaaec8762893ad4a0d71c36c"
 
 DEPENDS += "python3-setuptools-scm-native"
 
-- 
2.34.1

[PATCH 2/2] python3-attrs: skip test failing with pytest-8

[Tim Orling]

tests/test_funcs.py test_unknown test case is failing with
pytest 8. Skip it for now until upstream has a fix.

https://github.com/python-attrs/attrs/issues/1233

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
Tested with core-image-ptest-python3-attrs on qemux86-64.

 ...funcs-skip-test_unknown-for-pytest-8.patch | 30 +++++++++++++++++++
 .../python/python3-attrs_23.2.0.bb            |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-attrs/0001-test_funcs-skip-test_unknown-for-pytest-8.patch

diff --git a/meta/recipes-devtools/python/python3-attrs/0001-test_funcs-skip-test_unknown-for-pytest-8.patch b/meta/recipes-devtools/python/python3-attrs/0001-test_funcs-skip-test_unknown-for-pytest-8.patch
new file mode 100644
index 00000000000..bb69c0f1573
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-attrs/0001-test_funcs-skip-test_unknown-for-pytest-8.patch
@@ -0,0 +1,30 @@
+From cbe95e1aa6d95195dce13406a6f0522b2964babc Mon Sep 17 00:00:00 2001
+From: Tim Orling <tim.orling@konsulko.com>
+Date: Fri, 16 Feb 2024 07:17:19 -0800
+Subject: [PATCH] test_funcs: skip test_unknown for pytest 8
+
+https://github.com/python-attrs/attrs/issues/1233
+
+Upstream-Status: Inappropriate [Test case needs to be properly fixed upstream]
+
+Signed-off-by: Tim Orling <tim.orling@konsulko.com>
+---
+ tests/test_funcs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_funcs.py b/tests/test_funcs.py
+index 044aaab..0872c31 100644
+--- a/tests/test_funcs.py
++++ b/tests/test_funcs.py
+@@ -593,7 +593,7 @@ class TestAssoc:
+         for k, v in change_dict.items():
+             assert getattr(changed, k) == v
+ 
+-    @given(simple_classes())
++    @pytest.mark.skip('Broken with pytest 8. See https://github.com/python-attrs/attrs/issues/1233')
+     def test_unknown(self, C):
+         """
+         Wanting to change an unknown attribute raises an
+-- 
+2.34.1
+
diff --git a/meta/recipes-devtools/python/python3-attrs_23.2.0.bb b/meta/recipes-devtools/python/python3-attrs_23.2.0.bb
index 7b6a6bd94c9..cdd78c2bd9d 100644
--- a/meta/recipes-devtools/python/python3-attrs_23.2.0.bb
+++ b/meta/recipes-devtools/python/python3-attrs_23.2.0.bb
@@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19
 inherit pypi ptest python_hatchling
 
 SRC_URI += " \
+	file://0001-test_funcs-skip-test_unknown-for-pytest-8.patch \
 	file://run-ptest \
 "
 
-- 
2.34.1