gentoo auto-resync : 12:07:2024 - 12:25:38

3 files changed, 98 insertions, 2 deletions

diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index f476975c2dbb..d0319a0604f6 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,6 +1,7 @@
+AUX ipywidgets-8.1.3-pytest-8.patch 2981 BLAKE2B b6a5f16805d7bc4d924974e1372c767abdff4131274161ea64cd4ebba623f46a483458bf2b69b5aa7e99562df5c3d3232868cf3b0b46cd5b11ef2b8c7273022e SHA512 822498589557c5dd05e7e8bb62e339d758627d4cf9c78eea5471729845af46c323a572657f7292ea79d813942c354002df0fa59dc296042ed06d37df3c736fdc
 DIST ipywidgets-8.1.2.tar.gz 116492 BLAKE2B 0fc8283b332447cd3659d39d4564e2e794678169c7bc156660f3478251c4df23de1719e4fcf9651b9766506edf359bdfc803b1450520a3cbce290b39bd95bd3c SHA512 59ddc92bb9b18b6cd36b1499465e700ce9b11010e2d51cdf0a820b36efecbea1facab42ced2f61de312319f4fd4e672bb27b248d40ee0088f3b58acfd102ab61
 DIST ipywidgets-8.1.3.tar.gz 116515 BLAKE2B b7a11e7078ddbd99b8713fc3aa63c78118bf00b64c376412c608a622fda1e7d0430accb0959a56a474d2eeba4b5ce531255b52bba591f2806833644e47f2a7bd SHA512 3722e3716f367c6dce88c6ec401d23240c214793672ae76a12b672f77c7c801775d3253e1202749e54832d9dc13e4bb5984ec57e21607f12c22aced8874538db
 EBUILD ipywidgets-8.1.2-r1.ebuild 1306 BLAKE2B 95225f97749e6497191c66aeb9a48ddc61b45cca15c071db6da3757a375956a3182c4be2268a09e770a65ae76c4dc62c2758ec72b03e1d103ae1d48838eafb5d SHA512 29c58ffb639815cdb9c47c08193882ba01d526a1836c3a43dbe636e31a20cbe4e626dd52079b03456bd4a8d523b8a8da5efeb433aa2d22693dcda866da278746
 EBUILD ipywidgets-8.1.2.ebuild 1383 BLAKE2B 5dbb579631c4b7fada8a97ac0e333e30b9e255374be0615064dd74153cca62f1265c430c091511aba937fdf28754781838230e4b52dd638176ff878d318f9a48 SHA512 bc55d8828f27bac1e13f5c5c6c564fcbea801d6226ba0c0fad6a3ede88462c433e4c20bb162845623c467f177065b303a3dc537e8c7183b2fe29078b8904dba1
-EBUILD ipywidgets-8.1.3.ebuild 1333 BLAKE2B d205184d7ad71fd2f9372e48e1d2b26e70d01bb493ce8a661de1e018b61ba87a5c7bb34f2474d603abb52ac0048df5d933872b98f148caee0d96909d9a78eb72 SHA512 424edd2a4b5259de441a23b75a452e192305f95322bc3f20b39f97eb1121543e2801a83bc0fca3d85666cca2d601709d4f625f454969648e1902d9f090442d1f
+EBUILD ipywidgets-8.1.3.ebuild 1397 BLAKE2B c9f0d4ceeff0aacaf43abb5146beb55a6f16136d5567635ec21db2e6e9e11185ddd800f6709c0a9f52d569c118c18ece2ae515fd7178863be30ff364b29ab985 SHA512 5220800bd1d798c0902a4a10c0f7a3a488946907b1d773070c19cec712fc8388167e89243c12f7feee6c27bb84c88725fa3d9258a6b065cdb85e827b7be5bbe5
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
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=()