From 872919427e4bae7cfcb680fb27aab68bfc04828e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 11 Jan 2025 12:11:02 -0700 Subject: [PATCH] package/python-ws4py: bump to version 0.6.0 Drop patch which is no longer required. Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - ...1-Adjust-ws4py-for-Python-3.7-syntax.patch | 55 ------------------- package/python-ws4py/python-ws4py.hash | 4 +- package/python-ws4py/python-ws4py.mk | 4 +- 4 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch diff --git a/.checkpackageignore b/.checkpackageignore index 84b1e7ae00..ee89f7e4bf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1023,7 +1023,6 @@ package/python-scipy/0001-build-sh4-FE.patch lib_patch.Upstream package/python-setuptools/0001-add-executable.patch lib_patch.Upstream package/python-sip/0001-remove-join-from-sip-h-files-string.patch lib_patch.Upstream package/python-web2py/S51web2py Shellcheck lib_sysv.Variables -package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch lib_patch.Upstream package/python3/0001-Make-the-build-of-pyc-files-conditional.patch lib_patch.Upstream package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch lib_patch.Upstream package/python3/0003-Add-an-option-to-disable-pydoc.patch lib_patch.Upstream diff --git a/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch b/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch deleted file mode 100644 index 12dac30db8..0000000000 --- a/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dfe6f65b7078315c32cebb727e9c47ead7603475 Mon Sep 17 00:00:00 2001 -From: Asaf Kahlon -Date: Sun, 13 Oct 2019 16:44:44 +0300 -Subject: [PATCH] Adjust ws4py for Python 3.7 syntax - -Since Python 3.7, "async" has become a keyword and cannot be used. -Thus, instead of asyncio.async we will use asyncio.ensure_future. - -There's also a pull request with this change: -https://github.com/Lawouach/WebSocket-for-Python/pull/245 - -Signed-off-by: Asaf Kahlon ---- - ws4py/async_websocket.py | 4 ++-- - ws4py/server/tulipserver.py | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ws4py/async_websocket.py b/ws4py/async_websocket.py -index 9e2a4c7..ea296b4 100644 ---- a/ws4py/async_websocket.py -+++ b/ws4py/async_websocket.py -@@ -84,7 +84,7 @@ class WebSocket(_WebSocket): - def closeit(): - yield from self.proto.writer.drain() - self.proto.writer.close() -- asyncio.async(closeit()) -+ asyncio.ensure_future(closeit()) - - def _write(self, data): - """ -@@ -94,7 +94,7 @@ class WebSocket(_WebSocket): - def sendit(data): - self.proto.writer.write(data) - yield from self.proto.writer.drain() -- asyncio.async(sendit(data)) -+ asyncio.ensure_future(sendit(data)) - - @asyncio.coroutine - def run(self): -diff --git a/ws4py/server/tulipserver.py b/ws4py/server/tulipserver.py -index 2786c16..85312a2 100644 ---- a/ws4py/server/tulipserver.py -+++ b/ws4py/server/tulipserver.py -@@ -40,7 +40,7 @@ class WebSocketProtocol(asyncio.StreamReaderProtocol): - #self.stream.set_transport(transport) - asyncio.StreamReaderProtocol.connection_made(self, transport) - # Let make it concurrent for others to tag along -- f = asyncio.async(self.handle_initial_handshake()) -+ f = asyncio.ensure_future(self.handle_initial_handshake()) - f.add_done_callback(self.terminated) - - @property --- -2.20.1 - diff --git a/package/python-ws4py/python-ws4py.hash b/package/python-ws4py/python-ws4py.hash index 1e809fee0a..fc14748b8d 100644 --- a/package/python-ws4py/python-ws4py.hash +++ b/package/python-ws4py/python-ws4py.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ws4py/json -md5 68e0cfae9659dd059ff7e7a8218af548 ws4py-0.5.1.tar.gz -sha256 29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483 ws4py-0.5.1.tar.gz +md5 373750c014b6a5e225aad4cf5b0a5721 ws4py-0.6.0.tar.gz +sha256 9f87b19b773f0a0744a38f3afa36a803286dd3197f0bb35d9b75293ec7002d19 ws4py-0.6.0.tar.gz # Locally computed sha256 checksums sha256 3c98d9e820de01b1ae3be846419700ab9cefa22b09aa0ef441b3bfd5613c3ba1 LICENSE diff --git a/package/python-ws4py/python-ws4py.mk b/package/python-ws4py/python-ws4py.mk index edfd5d0df1..c76c636d8b 100644 --- a/package/python-ws4py/python-ws4py.mk +++ b/package/python-ws4py/python-ws4py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WS4PY_VERSION = 0.5.1 +PYTHON_WS4PY_VERSION = 0.6.0 PYTHON_WS4PY_SOURCE = ws4py-$(PYTHON_WS4PY_VERSION).tar.gz -PYTHON_WS4PY_SITE = https://files.pythonhosted.org/packages/53/20/4019a739b2eefe9282d3822ef6a225250af964b117356971bd55e274193c +PYTHON_WS4PY_SITE = https://files.pythonhosted.org/packages/cb/55/dd8a5e1f975d1549494fe8692fc272602f17e475fe70de910cdd53aec902 PYTHON_WS4PY_SETUP_TYPE = setuptools PYTHON_WS4PY_LICENSE = BSD-3-Clause PYTHON_WS4PY_LICENSE_FILES = LICENSE