3 files changed, 1 insertions, 78 deletions

diff --git a/meta/recipes-devtools/python/python3-attrs/0001-conftest.py-disable-deadline.patch b/meta/recipes-devtools/python/python3-attrs/0001-conftest.py-disable-deadline.patch
deleted file mode 100644
index b1e6d99916..0000000000
--- a/meta/recipes-devtools/python/python3-attrs/0001-conftest.py-disable-deadline.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 41103f017f6a233ebb477dd1712fe82ea8f1c84c Mon Sep 17 00:00:00 2001
-From: Tim Orling <tim.orling@konsulko.com>
-Date: Thu, 29 Feb 2024 08:45:54 -0800
-Subject: [PATCH] conftest.py: disable deadline
-
-The deadline is by default 200ms, but this is intended to be useful to
-the developer and not necessarily recommended for heavily loaded CI
-systems. Avoid warnings by disabling the deadline completely.
-
-https://github.com/HypothesisWorks/hypothesis/issues/3713
-https://hypothesis.readthedocs.io/en/latest/settings.html#hypothesis.settings.deadline
-https://lists.openembedded.org/g/openembedded-core/topic/104640034#196437
-
-Fixes:
-"""
-Unreliable test timings! On an initial run, this test took 268.29ms,
-which exceeded the deadline of 200.00ms, but on a subsequent run it
-took 2.63 ms, which did not. If you expect this sort of variability in
-your test timings, consider turning deadlines off for this test by
-setting deadline=None.
-"""
-
-Upstream-Status: Submitted [https://github.com/python-attrs/attrs/pull/1252]
-
-Signed-off-by: Tim Orling <tim.orling@konsulko.com>
----
- conftest.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conftest.py b/conftest.py
-index 144e5f3..fdead3d 100644
---- a/conftest.py
-+++ b/conftest.py
-@@ -20,7 +20,7 @@ def _frozen(request):
- def pytest_configure(config):
-     # HealthCheck.too_slow causes more trouble than good -- especially in CIs.
-     settings.register_profile(
--        "patience", settings(suppress_health_check=[HealthCheck.too_slow])
-+        "patience", settings(suppress_health_check=[HealthCheck.too_slow], deadline=None)
-     )
-     settings.load_profile("patience")
- 
--- 
-2.34.1
-
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
deleted file mode 100644
index bb69c0f157..0000000000
--- a/meta/recipes-devtools/python/python3-attrs/0001-test_funcs-skip-test_unknown-for-pytest-8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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_24.2.0.bb
index e39b64306c..a6cb60a8c8 100644
--- a/meta/recipes-devtools/python/python3-attrs_23.2.0.bb
+++ b/meta/recipes-devtools/python/python3-attrs_24.2.0.bb
@@ -3,13 +3,11 @@ HOMEPAGE = "http://www.attrs.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5e55731824cf9205cfabeab9a0600887"
 
-SRC_URI[sha256sum] = "935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"
+SRC_URI[sha256sum] = "5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346"
 
 inherit pypi ptest python_hatchling
 
 SRC_URI += " \
-        file://0001-test_funcs-skip-test_unknown-for-pytest-8.patch \
-        file://0001-conftest.py-disable-deadline.patch \
         file://run-ptest \
 "