commit: 1778a590b4325019fc321e21da7888a70f3cc2bd Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Thu Dec 11 04:34:09 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Thu Dec 11 04:41:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1778a590
net-p2p/deluge: port to EPYTEST_PLUGINS Fixes autoload conflicts *yet again*. ``` ValueError: Plugin already registered under a different name: twisted=<module 'pytest_twisted' from '/usr/lib/python3.13/site-packages/pytest_twisted/__init__.py'> ``` ... since commit 8b9ce599af12542699d6dd47b079f9b47ff386c6 (probably) the entrypoint exists again, and was always named something different from the import name. Bug: https://bugs.gentoo.org/866677 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> net-p2p/deluge/deluge-2.1.1-r6.ebuild | 9 ++------- net-p2p/deluge/deluge-2.1.1-r7.ebuild | 9 ++------- net-p2p/deluge/deluge-2.2.0.ebuild | 9 ++------- net-p2p/deluge/deluge-9999.ebuild | 9 ++------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/net-p2p/deluge/deluge-2.1.1-r6.ebuild b/net-p2p/deluge/deluge-2.1.1-r6.ebuild index 0cbe8012ae63..22a52989ba5c 100644 --- a/net-p2p/deluge/deluge-2.1.1-r6.ebuild +++ b/net-p2p/deluge/deluge-2.1.1-r6.ebuild @@ -29,11 +29,6 @@ REQUIRED_USE=" BDEPEND=" dev-util/intltool - test? ( - $(python_gen_cond_dep ' - >=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}] - ') - ) " RDEPEND=" @@ -69,6 +64,7 @@ PATCHES=( "${FILESDIR}/${P}-email-module-replace.patch" ) +EPYTEST_PLUGINS=( pytest-twisted ) distutils_enable_tests pytest python_prepare_all() { @@ -110,8 +106,7 @@ python_test() { 'deluge/tests/test_core.py::TestCore::test_pause_torrent' ) - # dev-python/pytest-twisted has disabled autoloading - epytest -m "not (todo or gtkui)" -p pytest_twisted -v + epytest -m "not (todo or gtkui)" -v } python_install_all() { diff --git a/net-p2p/deluge/deluge-2.1.1-r7.ebuild b/net-p2p/deluge/deluge-2.1.1-r7.ebuild index c7a066a57f8c..262cb6b6bdc8 100644 --- a/net-p2p/deluge/deluge-2.1.1-r7.ebuild +++ b/net-p2p/deluge/deluge-2.1.1-r7.ebuild @@ -30,11 +30,6 @@ REQUIRED_USE=" BDEPEND=" dev-util/intltool - test? ( - $(python_gen_cond_dep ' - >=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}] - ') - ) " RDEPEND=" @@ -73,6 +68,7 @@ PATCHES=( "${FILESDIR}/${P}-email-module-replace.patch" ) +EPYTEST_PLUGINS=( pytest-twisted ) distutils_enable_tests pytest python_prepare_all() { @@ -114,8 +110,7 @@ python_test() { 'deluge/tests/test_core.py::TestCore::test_pause_torrent' ) - # dev-python/pytest-twisted has disabled autoloading - epytest -m "not (todo or gtkui)" -p pytest_twisted -v + epytest -m "not (todo or gtkui)" -v } python_install_all() { diff --git a/net-p2p/deluge/deluge-2.2.0.ebuild b/net-p2p/deluge/deluge-2.2.0.ebuild index 9193bc68f415..366624b35706 100644 --- a/net-p2p/deluge/deluge-2.2.0.ebuild +++ b/net-p2p/deluge/deluge-2.2.0.ebuild @@ -30,11 +30,6 @@ REQUIRED_USE=" BDEPEND=" dev-util/intltool - test? ( - $(python_gen_cond_dep ' - >=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}] - ') - ) " RDEPEND=" @@ -64,6 +59,7 @@ RDEPEND=" ) " +EPYTEST_PLUGINS=( pytest-twisted ) distutils_enable_tests pytest python_prepare_all() { @@ -105,8 +101,7 @@ python_test() { 'deluge/tests/test_core.py::TestCore::test_pause_torrent' ) - # dev-python/pytest-twisted has disabled autoloading - epytest -m "not (todo or gtkui)" -p pytest_twisted -v + epytest -m "not (todo or gtkui)" -v } python_install_all() { diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index 9193bc68f415..366624b35706 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -30,11 +30,6 @@ REQUIRED_USE=" BDEPEND=" dev-util/intltool - test? ( - $(python_gen_cond_dep ' - >=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}] - ') - ) " RDEPEND=" @@ -64,6 +59,7 @@ RDEPEND=" ) " +EPYTEST_PLUGINS=( pytest-twisted ) distutils_enable_tests pytest python_prepare_all() { @@ -105,8 +101,7 @@ python_test() { 'deluge/tests/test_core.py::TestCore::test_pause_torrent' ) - # dev-python/pytest-twisted has disabled autoloading - epytest -m "not (todo or gtkui)" -p pytest_twisted -v + epytest -m "not (todo or gtkui)" -v } python_install_all() {
