From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 458A015ACFC for ; Mon, 1 May 2023 08:00:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80A76E07AE; Mon, 1 May 2023 08:00:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5161FE07AE for ; Mon, 1 May 2023 08:00:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DCC93414BF for ; Mon, 1 May 2023 08:00:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5957A4F for ; Mon, 1 May 2023 08:00:53 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1682928042.ba8d3ccfbcb2693d480c960c864545f358ac6be7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild net-analyzer/wireshark/wireshark-3.6.13.ebuild net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild net-analyzer/wireshark/wireshark-4.0.5.ebuild net-analyzer/wireshark/wireshark-9999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ba8d3ccfbcb2693d480c960c864545f358ac6be7 X-VCS-Branch: master Date: Mon, 1 May 2023 08:00:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 05162887-4a2f-45f9-9800-398967587c86 X-Archives-Hash: 248ae2e416bc30c7c03c5f45063be8ba commit: ba8d3ccfbcb2693d480c960c864545f358ac6be7 Author: Sam James gentoo org> AuthorDate: Mon May 1 07:59:34 2023 +0000 Commit: Sam James gentoo 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 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="