gentoo resync : 25.11.2020

3 files changed, 18 insertions, 7 deletions

diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index a79d15b2f16c..39d5fb2faa8b 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,7 +1,8 @@
 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
+AUX python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch 341 BLAKE2B 99635861a87bcc613540c0440edba10a3011c43ddfe91e675483db603308a655b8b77a832fc013016c7d3d0fe1dbe7c02f925dfc6b20cb514a37ca3d66c3dafa SHA512 3da608b3c7ed162d2b32c93f2f0733cc26e3ae218c65d3000d607a553240baef8ea47cddd8323caa58fea2fec59e8bf3f9b120a977b4522642b88ae55cf88f28
 DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0
 DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
 EBUILD python-jsonrpc-server-0.3.4.ebuild 823 BLAKE2B c5bed3fbd7d925a276095e4791ae344a7feaacc4b5ae42a8a4fe5c11cb019754ba75056c174cb1c321fdaced435548c55d068f459ddda5c85731f7521aca8e8e SHA512 d4c1ad78e518e7ed585908deebcd1ae2238dfeb45495a712b84cf23590e95f1010c96258f98ba7b586966ec2f7428de6777a8b4a531f7aca7cc6b71ba6f779ee
-EBUILD python-jsonrpc-server-0.4.0.ebuild 966 BLAKE2B a82491cd69683b651eeaa3449029cf8eaa4d81b473841513a1c97acdf76d2bbd5893980040acd0b94190821fe22cb678958be3b70ada6dda154ff935877ab3e9 SHA512 613a8c537c3a68295b684977856d214ae856d37d43b07ed7df67d2aba9cc752bc025fc6e51bf585866aa0d86c3d391547b95d315292c0de9c3fe1c2627c0e5c6
+EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B e3f5797334c29a39ccfaac7efe5ecd26901ec677f4708a82b8f1d4cae55e9fbf3b18c480cbb218006479788c39c224aefc6995227984281214b07e09f24e84cb SHA512 86e60b631f68bdc81b4ec53d0a26441d8a2369d713703808ca37f234680610a02ea5cbb7c6d026e0cb95abd58dfe4e17a09bdc005d513c2b7b754c6b4aa2cda8
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
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 858c1bae05a0..5c641f31ecab 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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
@@ -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
 }