From dbc464b7fc5f2cfdcce55e03ed68f66a80abc313 Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Date: Sun, 11 Oct 2020 13:13:14 +0200
Subject: dev-python/python-jsonrpc-server: fix bug in tests with ujson>3

Closes: https://bugs.gentoo.org/715290
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---
 ...server-0.4.0-fix-test-with-ujson-3-and-up.patch | 12 +++++++
 .../python-jsonrpc-server-0.4.0-r1.ebuild          | 35 ++++++++++++++++++++
 .../python-jsonrpc-server-0.4.0.ebuild             | 37 ----------------------
 3 files changed, 47 insertions(+), 37 deletions(-)
 create mode 100644 dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
 create mode 100644 dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
 delete mode 100644 dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild

(limited to 'dev-python/python-jsonrpc-server')

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
new file mode 100644
index 000000000000..b639d69bbd04
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
@@ -0,0 +1,12 @@
+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/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..33b6d6e78990
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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
+}
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild
deleted file mode 100644
index 0b4515918814..000000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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-1.35[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	# jsonrpc-server does not actually work with ujson>3.0.0: tests fail
-	sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' setup.py || die
-	sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' python_jsonrpc_server.egg-info/requires.txt || die
-
-	distutils-r1_python_prepare_all
-}
-- 
cgit v1.2.3