[gentoo-commits] repo/gentoo:master commit in: dev-python/python-jsonrpc-server/files/, dev-python/python-jsonrpc-server/

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-jsonrpc-server/files/, dev-python/python-jsonrpc-server/

[Matt Turner]

commit:     a4807704fd4dd65b3133dc886652ed6d480d8b4e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jan 26 18:54:51 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 20:37:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4807704

dev-python/python-jsonrpc-server: Version bump 0.3.4

Bug fix, github release tarball does not contain
correct version info

Bug: https://bugs.gentoo.org/706420
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-python/python-jsonrpc-server/Manifest          |  2 +-
 ...sonrpc-server-0.3.4-remove-pytest-cov-dep.patch | 15 ++++++++++++++
 ...2.ebuild => python-jsonrpc-server-0.3.4.ebuild} | 23 +++++++++++-----------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 97268a63340..31efd0bc424 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1 +1 @@
-DIST python-jsonrpc-server-0.3.2.tar.gz 32493 BLAKE2B b1e89c798e247b3b039645b99ca25898fa846676c646e58d8fabfdbd772e3efa1ad895dfa7b31931f1e7d91252c4327a324b929cd861b16bc2be32a64e064db1 SHA512 1d29858b8f6850a017c8e7e94196a972c985e72e9f57956afa2964feb109d9b5cfa33d534d279d817bd5a1454dfcde7d32cd13149c9a53fe1f9e6e0a5899f15c
+DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0

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
new file mode 100644
index 00000000000..a81919eae4b
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch
@@ -0,0 +1,15 @@
+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 = 

diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
similarity index 52%
rename from dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
rename to dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
index c3430e9a827..8881d6a78bb 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
@@ -9,23 +9,22 @@ inherit distutils-r1
 
 DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
 HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="https://github.com/palantir/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="examples"
-
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
 
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/ujson[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-remove-pytest-cov-dep.patch" )
 
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
+distutils_enable_tests pytest

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-jsonrpc-server/files/, dev-python/python-jsonrpc-server/

[Matt Turner]

commit:     09253c79f1f9e34ed0007733cca09c73ee70245d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 19:51:28 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 22:49:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09253c79

dev-python/python-jsonrpc-server: Add Python 3.8 compatibility

Closes: https://github.com/gentoo/gentoo/pull/16732
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...ython-3.8-fixes-for-endpoint-and-tests-37.patch | 84 ++++++++++++++++++++++
 .../python-jsonrpc-server-0.3.4.ebuild             |  7 +-
 2 files changed, 89 insertions(+), 2 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
new file mode 100644
index 00000000000..8d597ddda03
--- /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 <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/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
index d4423e655f5..637c726e751 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

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-jsonrpc-server/files/, dev-python/python-jsonrpc-server/

[Andrew Ammerlaan]

commit:     d21104e250d1efe06c79b4ffe9ba17e074f09a80
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 19:18:33 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 19:22:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21104e2

dev-python/python-jsonrpc-server: remove last-rited pack

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/python-jsonrpc-server/Manifest          |  1 -
 ...server-0.4.0-fix-test-with-ujson-3-and-up.patch | 12 --------
 dev-python/python-jsonrpc-server/metadata.xml      | 12 --------
 .../python-jsonrpc-server-0.4.0-r1.ebuild          | 35 ----------------------
 4 files changed, 60 deletions(-)

diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
deleted file mode 100644
index 32c97cef70e..00000000000
--- a/dev-python/python-jsonrpc-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc

diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
deleted file mode 100644
index b639d69bbd0..00000000000
--- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/test_streams.py b/test/test_streams.py
-index 6985aec..9e64489 100644
---- a/test/test_streams.py
-+++ b/test/test_streams.py
-@@ -119,6 +119,7 @@ def test_writer_bad_message(wfile, writer):
-         hour=1,
-         minute=1,
-         second=1,
-+        tzinfo=datetime.timezone.utc
-     ))
-
-     assert wfile.getvalue() in [

diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
deleted file mode 100644
index cc81d1f0619..00000000000
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">python-jsonrpc-server</remote-id>
-	</upstream>
-	<stabilize-allarches/>
-</pkgmetadata>

diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
deleted file mode 100644
index f19ac1fc657..00000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
-HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-)"
-
-RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-fix-test-with-ujson-3-and-up.patch" )
-
-python_prepare_all() {
-	# Remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}