diff options
| author |   Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2020-10-11 13:13:14 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2020-10-16 16:26:18 +0300 |
| commit | dbc464b7fc5f2cfdcce55e03ed68f66a80abc313 (patch) | |
| tree | dbf0ef3f1bdbdc725cb161af391749dc962f698a /dev-python | |
| parent | www-apps/kibana-bin: bump to 7.9.2 (diff) | |
| download | gentoo-dbc464b7fc5f2cfdcce55e03ed68f66a80abc313.tar.gz gentoo-dbc464b7fc5f2cfdcce55e03ed68f66a80abc313.tar.bz2 gentoo-dbc464b7fc5f2cfdcce55e03ed68f66a80abc313.zip | |
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>
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch | 12 | ||||
| -rw-r--r-- | dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild (renamed from dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild) | 8 |
2 files changed, 15 insertions, 5 deletions
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.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild index 0b4515918814..33b6d6e78990 100644 --- 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-r1.ebuild @@ -21,17 +21,15 @@ BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}] dev-python/pycodestyle[${PYTHON_USEDEP}] )" -RDEPEND="~dev-python/ujson-1.35[${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 - # 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 } |