gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-21 21:17:37 -08:00
Code Issues Projects Releases Wiki Activity

net-p2p/deluge: port to EPYTEST_PLUGINS

Browse Source 
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@gentoo.org>
This commit is contained in:
Eli Schwartz 2025-12-10 23:34:09 -05:00
parent 4eac92f82d
commit 1778a590b4
No known key found for this signature in database
GPG Key ID: 84A7D12B700D2F57
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net-p2p/deluge/deluge-2.1.1-r6.ebuild
View File

@ -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() {

9
net-p2p/deluge/deluge-2.1.1-r7.ebuild
View File

@ -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() {

9
net-p2p/deluge/deluge-2.2.0.ebuild
View File

@ -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() {

9
net-p2p/deluge/deluge-9999.ebuild
View File

@ -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() {