dev-python/ipywidgets: Add a pytest-8 fix

Signed-off-by: Michał Górny <mgorny@gentoo.org>

2 files changed, 96 insertions, 1 deletions

diff --git a/dev-python/ipywidgets/files/ipywidgets-8.1.3-pytest-8.patch b/dev-python/ipywidgets/files/ipywidgets-8.1.3-pytest-8.patch
new file mode 100644
index 000000000000..0294ec1ce604
--- /dev/null
+++ b/dev-python/ipywidgets/files/ipywidgets-8.1.3-pytest-8.patch
@@ -0,0 +1,91 @@
+From bbc6c064aa797eb21bd5a9b441dbbc76925a72db Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Thu, 11 Apr 2024 11:40:15 +0200
+Subject: [PATCH] Fix compatibility with pytest 8
+
+Resolves: https://github.com/jupyter-widgets/ipywidgets/issues/3883
+---
+ .../ipywidgets/ipywidgets/widgets/tests/test_interaction.py | 2 --
+ python/ipywidgets/ipywidgets/widgets/tests/test_link.py     | 1 -
+ .../ipywidgets/ipywidgets/widgets/tests/test_send_state.py  | 2 +-
+ .../ipywidgets/ipywidgets/widgets/tests/test_set_state.py   | 2 +-
+ python/ipywidgets/ipywidgets/widgets/tests/utils.py         | 6 +++---
+ 5 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/ipywidgets/widgets/tests/test_interaction.py b/ipywidgets/widgets/tests/test_interaction.py
+index 0dc7e5fcfc..feb1afe50c 100644
+--- a/ipywidgets/widgets/tests/test_interaction.py
++++ b/ipywidgets/widgets/tests/test_interaction.py
+@@ -19,8 +19,6 @@
+ # Utility stuff
+ #-----------------------------------------------------------------------------
+ 
+-from .utils import setup, teardown
+-
+ def f(**kwargs):
+     pass
+ 
+diff --git a/ipywidgets/widgets/tests/test_link.py b/ipywidgets/widgets/tests/test_link.py
+index 0c92dfdcb2..9301764d40 100644
+--- a/ipywidgets/widgets/tests/test_link.py
++++ b/ipywidgets/widgets/tests/test_link.py
+@@ -4,7 +4,6 @@
+ import pytest
+ 
+ from .. import jslink, jsdlink, ToggleButton
+-from .utils import setup, teardown
+ 
+ def test_jslink_args():
+     with pytest.raises(TypeError):
+diff --git a/ipywidgets/widgets/tests/test_send_state.py b/ipywidgets/widgets/tests/test_send_state.py
+index ec18ae4af1..98465b9b7d 100644
+--- a/ipywidgets/widgets/tests/test_send_state.py
++++ b/ipywidgets/widgets/tests/test_send_state.py
+@@ -3,7 +3,7 @@
+ 
+ from traitlets import Bool, Tuple, List
+ 
+-from .utils import setup, teardown, DummyComm
++from .utils import setup
+ 
+ from ..widget import Widget
+ 
+diff --git a/ipywidgets/widgets/tests/test_set_state.py b/ipywidgets/widgets/tests/test_set_state.py
+index 82ecbd9311..22ec54d90f 100644
+--- a/ipywidgets/widgets/tests/test_set_state.py
++++ b/ipywidgets/widgets/tests/test_set_state.py
+@@ -6,7 +6,7 @@
+ 
+ from traitlets import Bool, Tuple, List, Instance, CFloat, CInt, Float, Int, TraitError, observe
+ 
+-from .utils import setup, teardown
++from .utils import setup
+ 
+ import ipywidgets
+ from ipywidgets import Widget
+diff --git a/ipywidgets/widgets/tests/utils.py b/ipywidgets/widgets/tests/utils.py
+index 260485e3f8..8dbbcb355b 100644
+--- a/ipywidgets/widgets/tests/utils.py
++++ b/ipywidgets/widgets/tests/utils.py
+@@ -12,7 +12,7 @@
+     NEW_COMM_PACKAGE = False
+ 
+ import ipykernel.comm
+-
++import pytest
+ 
+ class DummyComm():
+     comm_id = 'a-b-c-d'
+@@ -87,10 +87,10 @@ def teardown_test_comm():
+             setattr(Widget, attr, value)
+     _widget_attrs.clear()
+ 
++@pytest.fixture(autouse=True)
+ def setup():
+     setup_test_comm()
+-
+-def teardown():
++    yield
+     teardown_test_comm()
+ 
+ def call_method(method, *args, **kwargs):
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
index 9d099f8b07ae..cbbddfa905e2 100644
--- a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
-		<dev-python/pytest-8.1[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
 "
@@ -41,6 +40,11 @@ PDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/jupyter-widgets/ipywidgets/pull/3903
+	"${FILESDIR}/${P}-pytest-8.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=()