commit: d96477daacd071997dc5f0898f3e8ede99f0c497 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Mar 16 16:31:48 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Mar 16 16:31:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96477da
dev-python/trio-websocket: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/trio-websocket/Manifest | 1 - .../files/trio-websocket-0.9.2-async-gen.patch | 79 ---------------------- .../trio-websocket/trio-websocket-0.9.2.ebuild | 47 ------------- 3 files changed, 127 deletions(-) diff --git a/dev-python/trio-websocket/Manifest b/dev-python/trio-websocket/Manifest index 3b52207d94d9..737e9c6f334e 100644 --- a/dev-python/trio-websocket/Manifest +++ b/dev-python/trio-websocket/Manifest @@ -1,2 +1 @@ DIST trio-websocket-0.10.0.gh.tar.gz 43808 BLAKE2B fd89ab74c3844a14940ce07a0abc07a0392607b492fa4b6e1d81ba3aa2c37338706975cb800332751c9ea70e934c4169fdcd29dd047019096726164a2130daa9 SHA512 04d775a7c1a232b470a7f415b57debce4bd1c3732934a94d65e3c9f3bb45c5ffea7464557100e2e9f68a2aa6a7812bd686220de046f399a0d0242309d2d9be59 -DIST trio-websocket-0.9.2.gh.tar.gz 43146 BLAKE2B f5463d20253c3686a0d0fe4cb38ffec235c4378c14ed2952b3518486602b06bb961291d098542a52dee7e25506713df382e303cd2dc7fa579041124d66c8ecb8 SHA512 0f25a7d234a6d9f7c0c0bdbbd2836e6baee02b4ff2daab8354f8fd483a10de65fe357a273675a172227b1b0e9f7cf6cf27ddfdf9426d1b330122a8b2ef957435 diff --git a/dev-python/trio-websocket/files/trio-websocket-0.9.2-async-gen.patch b/dev-python/trio-websocket/files/trio-websocket-0.9.2-async-gen.patch deleted file mode 100644 index 7631e2118678..000000000000 --- a/dev-python/trio-websocket/files/trio-websocket-0.9.2-async-gen.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 37388d8122960f6aec707a9aa30a310bdc67610a Mon Sep 17 00:00:00 2001 -From: John Belmonte <[email protected]> -Date: Sat, 21 Nov 2020 15:38:54 +0900 -Subject: [PATCH] use native async generator support - ---- - tests/test_connection.py | 7 ++----- - trio_websocket/_impl.py | 5 ++--- - 2 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/tests/test_connection.py b/tests/test_connection.py -index 8af07a9..7832355 100644 ---- a/tests/test_connection.py -+++ b/tests/test_connection.py -@@ -37,7 +37,6 @@ - import pytest - import trio - import trustme --from async_generator import async_generator, yield_ - from trio.testing import memory_stream_pair - from wsproto.events import CloseConnection - -@@ -78,24 +77,22 @@ - - - @pytest.fixture --@async_generator - async def echo_server(nursery): - ''' A server that reads one message, sends back the same message, - then closes the connection. ''' - serve_fn = partial(serve_websocket, echo_request_handler, HOST, 0, - ssl_context=None) - server = await nursery.start(serve_fn) -- await yield_(server) -+ yield server - - - @pytest.fixture --@async_generator - async def echo_conn(echo_server): - ''' Return a client connection instance that is connected to an echo - server. ''' - async with open_websocket(HOST, echo_server.port, RESOURCE, - use_ssl=False) as conn: -- await yield_(conn) -+ yield conn - - - async def echo_request_handler(request): -diff --git a/trio_websocket/_impl.py b/trio_websocket/_impl.py -index 693c379..440d0e2 100644 ---- a/trio_websocket/_impl.py -+++ b/trio_websocket/_impl.py -@@ -9,7 +9,7 @@ - import struct - import urllib.parse - --from async_generator import async_generator, yield_, asynccontextmanager -+from async_generator import asynccontextmanager - import trio - import trio.abc - from wsproto import ConnectionType, WSConnection -@@ -65,7 +65,6 @@ def remove_cancels(exc): - - - @asynccontextmanager --@async_generator - async def open_websocket(host, port, resource, *, use_ssl, subprotocols=None, - extra_headers=None, - message_queue_size=MESSAGE_QUEUE_SIZE, max_message_size=MAX_MESSAGE_SIZE, -@@ -115,7 +114,7 @@ async def open_websocket(host, port, resource, *, use_ssl, subprotocols=None, - except OSError as e: - raise HandshakeError from e - try: -- await yield_(connection) -+ yield connection - finally: - try: - with trio.fail_after(disconnect_timeout): diff --git a/dev-python/trio-websocket/trio-websocket-0.9.2.ebuild b/dev-python/trio-websocket/trio-websocket-0.9.2.ebuild deleted file mode 100644 index e9cd84406569..000000000000 --- a/dev-python/trio-websocket/trio-websocket-0.9.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="WebSocket client and server implementation for Python Trio" -HOMEPAGE=" - https://github.com/HyperionGray/trio-websocket/ - https://pypi.org/project/trio-websocket/ -" -SRC_URI=" - https://github.com/HyperionGray/trio-websocket/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86" - -RDEPEND=" - >=dev-python/async_generator-1.10[${PYTHON_USEDEP}] - >=dev-python/trio-0.11[${PYTHON_USEDEP}] - >=dev-python/wsproto-0.14[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/pytest-trio-0.5.0[${PYTHON_USEDEP}] - dev-python/trustme[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -PATCHES=( - # backport from https://github.com/HyperionGray/trio-websocket/pull/138/ - "${FILESDIR}"/${P}-async-gen.patch -) - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p trio -}
