commit: ba8d3ccfbcb2693d480c960c864545f358ac6be7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon May 1 07:59:34 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon May 1 08:00:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba8d3ccf
net-analyzer/wireshark: enable py3.11, restrict tests temporarily We need to restrict tests for now because Wireshark w/ py3.11 uses pytest internals that got removed. Unfortunately, when running tests w/ unittest, some tests end up failing (and it's not easy to skip them), and it's much slower. Closes: https://bugs.gentoo.org/897078 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild | 6 ++++-- net-analyzer/wireshark/wireshark-3.6.13.ebuild | 6 ++++-- net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild | 6 ++++-- net-analyzer/wireshark/wireshark-4.0.5.ebuild | 6 ++++-- net-analyzer/wireshark/wireshark-9999.ebuild | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild index e037030ee391..0079012cf99c 100644 --- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) plugin-ifdemo? ( plugins qt5 )" -RESTRICT="!test? ( test )" +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" # bug #753062 for speexdsp RDEPEND="acct-group/pcap diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild b/net-analyzer/wireshark/wireshark-3.6.13.ebuild index 0e8916b20943..1e4730af8694 100644 --- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) plugin-ifdemo? ( plugins qt5 )" -RESTRICT="!test? ( test )" +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" # bug #753062 for speexdsp RDEPEND="acct-group/pcap diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild index b80599dfacbf..6039d7e9573b 100644 --- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake @@ -35,7 +35,9 @@ REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) " -RESTRICT="!test? ( test )" +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" # bug #753062 for speexdsp RDEPEND=" diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild b/net-analyzer/wireshark/wireshark-4.0.5.ebuild index f22f7cd62c6b..36658422a00e 100644 --- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake @@ -35,7 +35,9 @@ REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) " -RESTRICT="!test? ( test )" +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" # bug #753062 for speexdsp RDEPEND=" diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 62593372fe05..2c6116786ce7 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -35,7 +35,9 @@ REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) " -RESTRICT="!test? ( test )" +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" # bug #753062 for speexdsp RDEPEND="
