From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-python/python-jsonrpc-server/Manifest | 3 +- ...ython-3.8-fixes-for-endpoint-and-tests-37.patch | 84 ++++++++++++++++++++++ .../python-jsonrpc-server-0.3.4.ebuild | 7 +- 3 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch (limited to 'dev-python/python-jsonrpc-server') diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest index ac6181caa271..3cfc18f64c65 100644 --- a/dev-python/python-jsonrpc-server/Manifest +++ b/dev-python/python-jsonrpc-server/Manifest @@ -1,4 +1,5 @@ +AUX python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch 3003 BLAKE2B 9b4cb5168bd591a8832ddc3bcb14797adb58b5acbf5d4be22d7a6d5e559ea32013670417e15005c123d4d322e4af53b866cef0ddcf2f9a1720d200686e11ece9 SHA512 599cb7561e1fdee594f9059a6a669725e6b0d1909309bec28ede40d47a0e2a151f419011279cd8823d4a2946499696d240d099b9947784d19dc457279db20c20 AUX python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch 359 BLAKE2B 73548cee569f25bfd6cf98897ab5553507adb4e2f28a2cad6029451432f2144a8de2643bec491a1937f88fc2b7bb3a2f23dd1b56bc82eaec94f206fbdf0b133a SHA512 d8a7ac71a897d4dce9290b51a658443e5b6c954e38cd8477a55a5e3b8abaabf033a9f34410eb282156340efed36758a904eb2473a91b01fa181615fd8a641761 DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0 -EBUILD python-jsonrpc-server-0.3.4.ebuild 751 BLAKE2B fddea08399b1353f8c69d00b4954c3767c94b8718b673fc15f3d33b47abec3141423587cba4124969bbee4b3be22203b641306a2fcc9cc1683a2811daa2fbd86 SHA512 714453f951851bb038a8cb4810ec31c2993f8104efd81c2c92dfb6e281666975c9b2e5fd95d19ca4e6a3d5b884db57bfe71be16e2de55285756e654ed8cec04d +EBUILD python-jsonrpc-server-0.3.4.ebuild 825 BLAKE2B 0bbcc16c879062d0b34d81767c165aa27e358d8dbcbeca5e402910594c97816879ccd76e7327ca96eb09dd42d450ad5e024bfcc234f3a7dfc0fb3d3a0a788f71 SHA512 05711e36751bd7b2ad02513d86f2cb117e1969b47a40b2279affce986a365280a5f75542634b6fee82ff7abbc3027eac0c7b042e6ea5ec424a853577a4ce6a4f MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225 diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch new file mode 100644 index 000000000000..8d597ddda03f --- /dev/null +++ b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch @@ -0,0 +1,84 @@ +From 7987e30c99edddab8acbf567bad0ebf2d1c3381d Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Mon, 17 Aug 2020 21:28:03 +0200 +Subject: [PATCH] Python 3.8 fixes for endpoint and tests (#37) + +* fix endpoint exception lists for Python 3.8 +Author: @maximbaz according to #33 + +* fix test_writer_bad_message +not only windows can have problems with serializing datetime + +Co-authored-by: Carlos Cordoba +Co-authored-by: Marko Bakovic +--- + pyls_jsonrpc/endpoint.py | 1 + + test/test_endpoint.py | 4 ++-- + test/test_streams.py | 19 +++++++++---------- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/pyls_jsonrpc/endpoint.py b/pyls_jsonrpc/endpoint.py +index e8bfb5b..0caf612 100644 +--- a/pyls_jsonrpc/endpoint.py ++++ b/pyls_jsonrpc/endpoint.py +@@ -236,6 +236,7 @@ class Endpoint(object): + if error is not None: + log.debug("Received error response to message %s: %s", msg_id, error) + request_future.set_exception(JsonRpcException.from_dict(error)) ++ return + + log.debug("Received result for message %s: %s", msg_id, result) + request_future.set_result(result) +diff --git a/test/test_endpoint.py b/test/test_endpoint.py +index 47a038b..b954732 100644 +--- a/test/test_endpoint.py ++++ b/test/test_endpoint.py +@@ -115,9 +115,9 @@ def test_request_cancel(endpoint, consumer): + 'params': {'id': MSG_ID} + }) + +- with pytest.raises(exceptions.JsonRpcException) as exc_info: ++ with pytest.raises((exceptions.JsonRpcException, futures.CancelledError)) as exc_info: + assert future.result(timeout=2) +- assert exc_info.type == exceptions.JsonRpcRequestCancelled ++ assert exc_info.type in (exceptions.JsonRpcRequestCancelled, futures.CancelledError) + + + def test_consume_notification(endpoint, dispatcher): +diff --git a/test/test_streams.py b/test/test_streams.py +index 8c2e93e..480a73b 100644 +--- a/test/test_streams.py ++++ b/test/test_streams.py +@@ -97,7 +97,8 @@ def test_writer(wfile, writer): + + def test_writer_bad_message(wfile, writer): + # A datetime isn't serializable(or poorly serializable), +- # ensure the write method doesn't throw ++ # ensure the write method doesn't throw, but the result could be empty ++ # or the correct datetime + import datetime + writer.write(datetime.datetime( + year=2019, +@@ -108,12 +109,10 @@ def test_writer_bad_message(wfile, writer): + second=1, + )) + +- if os.name == 'nt': +- assert wfile.getvalue() == b'' +- else: +- assert wfile.getvalue() == ( +- b'Content-Length: 10\r\n' +- b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n' +- b'\r\n' +- b'1546304461' +- ) ++ assert wfile.getvalue() in [ ++ b'', ++ b'Content-Length: 10\r\n' ++ b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n' ++ b'\r\n' ++ b'1546304461' ++ ] +-- +2.26.2 + diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild index d4423e655f56..637c726e751e 100644 --- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild +++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7,8} ) inherit distutils-r1 @@ -26,6 +26,9 @@ DEPEND="test? ( dev-python/pylint[${PYTHON_USEDEP}] )" -PATCHES=( "${FILESDIR}/${P}-remove-pytest-cov-dep.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-remove-pytest-cov-dep.patch + "${FILESDIR}"/${P}-Python-3.8-fixes-for-endpoint-and-tests-37.patch +) distutils_enable_tests pytest -- cgit v1.2.3