summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2021-01-27 13:50:16 +0100
committerConrad Kostecki <conikost@gentoo.org>2021-01-27 19:17:16 +0100
commitc9965dc7a1e2030692753b358f6a43c9df9a38ec (patch)
tree007b6d9dad89950e5edd61a7d553f683c5b74bd6 /dev-python/python-jsonrpc-server
parentdev-python/pid: remove unused patch(es) (diff)
downloadgentoo-c9965dc7a1e2030692753b358f6a43c9df9a38ec.tar.gz
gentoo-c9965dc7a1e2030692753b358f6a43c9df9a38ec.tar.bz2
gentoo-c9965dc7a1e2030692753b358f6a43c9df9a38ec.zip
dev-python/python-jsonrpc-server: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/19236 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'dev-python/python-jsonrpc-server')
-rw-r--r--dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch84
-rw-r--r--dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch15
2 files changed, 0 insertions, 99 deletions
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
deleted file mode 100644
index 8d597ddda03f..000000000000
--- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 7987e30c99edddab8acbf567bad0ebf2d1c3381d Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-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 <ccordoba12@gmail.com>
-Co-authored-by: Marko Bakovic <delta003@users.noreply.github.com>
----
- 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/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch
deleted file mode 100644
index a81919eae4bd..000000000000
--- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-pytest-cov is a deprecated dep
-diff --git a/setup.cfg b/setup.cfg
-index 03b63df..165c746 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -13,9 +13,6 @@ exclude = test/plugins/.ropeproject,test/.ropeproject
-
- [tool:pytest]
- testpaths = test
--addopts =
-- --cov-report html --cov-report term --junitxml=pytest.xml
-- --cov pyls --cov test
-
- [egg_info]
- tag_build =