gentoo resync : 16.04.2022

5 files changed, 15 insertions, 110 deletions

diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 585cc259e7cc..748f50cf1c93 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,8 +1,3 @@
-AUX websockets-10.0-py3.9-fix-deprecation.patch 1822 BLAKE2B ccbde169be0d9c218035ea3889af3d0fd714af9a912ae0835a4140265235a54f2f9c0f07cfd85f6f7336653a80cdd44ab73fa2340f63b58008929a8710b1d6d0 SHA512 bf9fb815ec5d345903d9c07d48199d4e2578dd38119d060059c28038f59f506ee0005e088f4cf8ef7340a9e87656055b272cdf083482d2f70617d9f6ea46f08a
-DIST websockets-10.0-src.tar.gz 276231 BLAKE2B 6170f0540bc33be3d9a71f596ffee58e6e43c2173239a8fffe4f0c2a7555f8ce26849d85ed7865a5df6a4401f01bb0c928a341598916487cc79152a5031e9bbc SHA512 532289dc411d11cffc6e5aa07013cdad9655f124fbbd5dbdfe92985caf554644976a521466b1d3cbe124de11809e395b5e83195eac87495585779591b189c4d7
-DIST websockets-10.1-src.tar.gz 299315 BLAKE2B 425e7c8597f081874127ac75003aed11ebb2cf647ce9fed9e17c955e485a7a59c95d1112524d3f0d747b796b0cc41972258661c9fc9c7972f68aaebe3223b596 SHA512 c284ec92bc133c7083a72d4f364d9ace13d3eb6d7355ae46084d8097c137cdec3933cae9d5ab72d8a517af38328cea6c39877f747f5386df54a7362271cc7e7b
 DIST websockets-10.2-src.tar.gz 302766 BLAKE2B 2313bab904de3671f973191f1c43d275ede44c87811d82f22c6bd76145610ba5d4ba4d7a1b3a564bfc8c4a9b7921b2edc640af9304733e85deac1e728f0050f3 SHA512 b8c7fbe627e1c411112b0d66e561aa9bcf15d6de07a9cccd203211e0e6af49762774e09f8c5f4523fe214731ae7a96ed4b63639c7ed66fee062cdda3e5fba350
-EBUILD websockets-10.0.ebuild 860 BLAKE2B b99a1ce2f84978152bfa893a3b3279a790206bd12f538387729c1d1f035d7a020bdeca156cbf879fd5625e4fd9ceb32955a4c106c7fb8bd9e1a74c38970e9874 SHA512 47facb76b64ff4e6816e7f352cac5b39f2a4e2d6a0bcfd44f52e958c6bcaa422205e6961807853684afce58446d99f3b76270943c5e079baaa27101dd249909f
-EBUILD websockets-10.1.ebuild 726 BLAKE2B 86a28906af41f3b704bc9ff3b5b696e7b88bffab9915269b343794414d9fbf80f92c96f840c8126961c4a8801cee3a167369a42982a3612e9d57253c87e82df5 SHA512 0a6fd4666459490052dfd85b66a4d3229abc3ee974c8f6ab1bf39b3f2bd2d2bf5d65b6919ee13cd8a8eb2609dc00a11a21b3e721c41ceaa888499bbeda283655
-EBUILD websockets-10.2.ebuild 759 BLAKE2B a6818274ee9b50f1261f0b9a86d76301e8bcc483b148e87e3ce46638b224674f450c2d5916f7f6e9bc33e452e9b1dcb386215e78c6a1e65a3f22faf9b23621fd SHA512 f4e0e2511b67d33435e3f36e8679af880b7430ab1945738ba15876ead88b239e91f3ffeaf75668402588bf175a9669db3fa81f96ffab0c7aa50f0bd38b175fd4
+EBUILD websockets-10.2.ebuild 950 BLAKE2B 4e304c034032266851bd97e317baa7cadced76323d98557a151625b46daa33835254f54ca16ab4eb18fc3442ec0700fb7d1f9d5f1f669696b00cf21761fc64bb SHA512 3382b8cf490a986eeb288da00e37daee9e03f0076c48d972e80f1d01c0c7e7c35fdb1dc55789cd45a6a1632d832d2f9085f438c89b3167caa4593dbce24f2e5b
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch b/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch
deleted file mode 100644
index bbfb500b9094..000000000000
--- a/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/tests/legacy/test_client_server.py
-+++ b/tests/legacy/test_client_server.py
-@@ -229,7 +229,6 @@ class ClientServerTestsMixin:
-             and "remove loop argument" not in expected_warnings
-         ):  # pragma: no cover
-             expected_warnings += ["There is no current event loop"]
--        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
-
-     def start_client(
-         self, resource_name="/", user_info=None, deprecation_warnings=None, **kwargs
-@@ -255,7 +254,6 @@ class ClientServerTestsMixin:
-             and "remove loop argument" not in expected_warnings
-         ):  # pragma: no cover
-             expected_warnings += ["There is no current event loop"]
--        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
-
-     def stop_client(self):
-         try:
-@@ -457,16 +455,12 @@ class CommonClientServerTests:
-             with warnings.catch_warnings(record=True) as recorded_warnings:
-                 unix_server = unix_serve(default_handler, path, loop=self.loop)
-                 self.server = self.loop.run_until_complete(unix_server)
--            self.assertDeprecationWarnings(recorded_warnings, ["remove loop argument"])
-
-             try:
-                 # Like self.start_client() but with unix_connect()
-                 with warnings.catch_warnings(record=True) as recorded_warnings:
-                     unix_client = unix_connect(path, loop=self.loop)
-                     self.client = self.loop.run_until_complete(unix_client)
--                self.assertDeprecationWarnings(
--                    recorded_warnings, ["remove loop argument"]
--                )
-                 try:
-                     self.loop.run_until_complete(self.client.send("Hello!"))
-                     reply = self.loop.run_until_complete(self.client.recv())
diff --git a/dev-python/websockets/websockets-10.0.ebuild b/dev-python/websockets/websockets-10.0.ebuild
deleted file mode 100644
index 18adcbacd68c..000000000000
--- a/dev-python/websockets/websockets-10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="
-	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	# Fails checks for deprecations warnings on py3.9 for the loop argument
-	"${FILESDIR}/${P}-py3.9-fix-deprecation.patch"
-)
-
-src_prepare() {
-	# these fail due to timeouts on slower hardware
-	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
-		-e 's:test_keepalive_ping(:_&:' \
-		-i tests/legacy/test_protocol.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/websockets/websockets-10.1.ebuild b/dev-python/websockets/websockets-10.1.ebuild
deleted file mode 100644
index 56fdcc373e66..000000000000
--- a/dev-python/websockets/websockets-10.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="
-	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# these fail due to timeouts on slower hardware
-	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
-		-e 's:test_keepalive_ping(:_&:' \
-		-i tests/legacy/test_protocol.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/websockets/websockets-10.2.ebuild b/dev-python/websockets/websockets-10.2.ebuild
index e43c8d5084ee..4287b1679bd3 100644
--- a/dev-python/websockets/websockets-10.2.ebuild
+++ b/dev-python/websockets/websockets-10.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -16,14 +16,19 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
-src_prepare() {
-	# these fail due to timeouts on slower hardware
-	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
-		-e 's:test_keepalive_ping(:_&:' \
-		-i tests/legacy/test_protocol.py || die
-	distutils-r1_src_prepare
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very fragile to speed
+		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_utils.py::SpeedupsTests::test_apply_mask_non_contiguous_memoryview
+		tests/legacy/test_client_server.py::SecureClientServerTests::test_http_request_ws_endpoint
+	)
+
+	epytest tests
 }