rework jsonrpc-websocket

2020-09-05 17:34:53 +02:00
parent 7e1bef5f4b
commit 584047e41f
6 changed files with 69 additions and 27 deletions
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -43,6 +43,7 @@
  * update discord-py DEPENDs
  * home-assistant-cli: fix Typo
  * rework & clean up python-jose-cryptodome-1.3.2-r2
+  * rework jsonrpc-websocket

 2020-09-01
  * bump xknx-0.13.0
--- a/dev-python/jsonrpc-websocket/Manifest
+++ b/dev-python/jsonrpc-websocket/Manifest
@@ -1,5 +1,7 @@
 DIST jsonrpc-websocket-0.6.tar.gz 5031 BLAKE2B 51d0fc1c48134f1314a863dc78d022ee88bd9a18d64c35506f8428ca4718863f0f01475fca390bab35f228f4cda1ecd17ba79918f9c336fd7c10b59cfaf07bc7 SHA512 444c16b629660620ad7f80feea29cf6ccab83a8f7575dc92a752d9f0758c6199ffef745e88b9cf76f89fc1369b43318a14aa3cf4a5665e0f77d559230a6cde6e
 DIST jsonrpc-websocket-1.0.1.tar.gz 5058 BLAKE2B 77bb4a9208a80d3f6bada4671ae54622e899f138d4a7588b980e8f4f66367ce4586b3f8f0251d4e71f40602d395f78a8d8a729cd0738f164e175c9f92b9c894b SHA512 d371ccec1cc6848a8999d0ed0b2ee5614039bc8ce52f7d5774846d1777739f46766ec46e569234146be64dd4b86f3711c13dd3638b0336cc1c1fb57a161e60cc
-EBUILD jsonrpc-websocket-0.6.ebuild 726 BLAKE2B 71294fe22d545a71a0f1f49214773a5419792410a01c07226e1f48b8b83fe550d654fda9747aa911b5a2c4f32259d0d4efb154e4a98e3e5c0f61f2cdf5e01463 SHA512 37477202e34565d375d3204faa2458d08863639d71e5951fd46e0cb32c197af86d2f1b2a60ea2d6af57036641f5efff41aa9190f62966ba02cf20bb9a04e013e
-EBUILD jsonrpc-websocket-1.0.1.ebuild 716 BLAKE2B f859f882d96a7f39fe099c4815fbd86a4e3cbe92d883fdafa040e5f751b8900020b93438410c19df5d1d735188ee53d01b2d91cb6c7fdf3a70cdef7aec05991e SHA512 bc0b70ab54be58181a6a6dd48dac4755c874e1574b6d28ca621bfe972cf0c9be899631b763b642ae8ad048e8fc10b5a88af5078bbdeea3a81e59009a8d24bd2b
-MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
+DIST jsonrpc-websocket-1.2.0.tar.gz 8620 BLAKE2B e001abbe7674f9d9a7a8ea8d1ee37baff23058e97a7e1fc358d76a2728a7f522ee412ae166cd9db84e6b5d66a9c569f2f477797e86da4715fe951e37e4e55fa5 SHA512 2c7848dfd528514a7723795ddd6741efda9c6f2d525cd6e3991e22616a75d755ac218ff709ad4392863ca1b4e1a7e3ff1e44c6076f8d17704bb1fc02778fbaf2
+EBUILD jsonrpc-websocket-0.6.ebuild 837 BLAKE2B 56d274730c005d86d82ad3f6afdcad17bb48c22ea8216efb66ac3653af400cb6bb57f3c9e737ef0fbc885b2e5d67cb14769bde271c281164fc2e8a685c9e4271 SHA512 166f1d1ae97a014d633913c14f709c2fd289fc9195a7bf814d7f2f280f56f632b41985f64c888a6248483272ba59fb4709510d421d4e572cb6a651a143089b4d
+EBUILD jsonrpc-websocket-1.0.1.ebuild 840 BLAKE2B b7dc52a7f5f33ad2e29322b2e5220b340291cdee295b71f408e8dac7412dd52a1eef2d04ba5da7edf6953dda8331b6be73b07d0fee5698bb269018792c6bdd86 SHA512 981233f2421dff534e777da657c6160ce3d779c112f815fc87ae723777996b765cebf6421a1e5fd80858aac0d7f4dc510ddf3e58de17846923facc3617bbdded
+EBUILD jsonrpc-websocket-1.2.0.ebuild 840 BLAKE2B 6d941c9d7c4606f42d139fbfcb41efeb89ad410457b1257ee32d1eda34e740936caf4cc6ebc55dbe38a517662f852534d2bb5c19028c394f66bbd4698f7cc89e SHA512 5be5027cbad0698f1e11bd70c5988add8348d13dcf8e7271cc6494ed3057d48d48bef2a8094f78e247509e8c517ce599acf66c5773a08305fabfe20cffa4cf9e
+MISC metadata.xml 456 BLAKE2B 084a16539bbcf542fe9fc66700e2dd2ace8a11e25d01713d4a96a2111929ead9a447fda533d42d4e0979e8adbe7e3734d529f1ea3ce035ee253c81f61af41c24 SHA512 89eb39e93c6f46f2949e8d1651fc821306792281d6cb2bebc7fded98ffaa1739f56c2c84bac20b22be64834ad1eaefb5f1dc77349d835d6283315048881a772d
--- a/dev-python/jsonrpc-websocket/jsonrpc-websocket-0.6.ebuild
+++ b/dev-python/jsonrpc-websocket/jsonrpc-websocket-0.6.ebuild
@@ -1,32 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI="7"

-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{5..7} )

 inherit distutils-r1

 DESCRIPTION="A JSON-RPC websocket client library for asyncio"
-HOMEPAGE="https://github.com/armills/jsonrpc-websocket"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://github.com/emlove/jsonrpc-websocket https://pypi.org/project/jsonrpc-websocket/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"

-DEPEND="
+RDEPEND="~dev-python/jsonrpc-base-1.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]"
+BDEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	)
-"
-
-# Many tests fail, even on a regular tox run on a upstream clone
-RESTRICT="test"
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"

 python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
 	${PYTHON} psutil/tests/__main__.py || die
 }
--- a/dev-python/jsonrpc-websocket/jsonrpc-websocket-1.0.1.ebuild
+++ b/dev-python/jsonrpc-websocket/jsonrpc-websocket-1.0.1.ebuild
@@ -1,32 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI="7"

-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )

 inherit distutils-r1

 DESCRIPTION="A JSON-RPC websocket client library for asyncio"
-HOMEPAGE="https://github.com/armills/jsonrpc-websocket"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://github.com/emlove/jsonrpc-websocket https://pypi.org/project/jsonrpc-websocket/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"

-DEPEND="
+RDEPEND=">=dev-python/jsonrpc-base-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]"
+BDEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	)
-"
-
-# Many tests fail, even on a regular tox run on a upstream clone
-RESTRICT="test"
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"

 python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
 	${PYTHON} psutil/tests/__main__.py || die
 }
--- a/dev-python/jsonrpc-websocket/jsonrpc-websocket-1.2.0.ebuild
+++ b/dev-python/jsonrpc-websocket/jsonrpc-websocket-1.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A JSON-RPC websocket client library for asyncio"
+HOMEPAGE="http://github.com/emlove/jsonrpc-websocket https://pypi.org/project/jsonrpc-websocket/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/jsonrpc-base-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.0.0[${PYTHON_USEDEP}]"
+BDEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+	${PYTHON} psutil/tests/__main__.py || die
+}
--- a/dev-python/jsonrpc-websocket/metadata.xml
+++ b/dev-python/jsonrpc-websocket/metadata.xml
@@ -5,4 +5,11 @@
    <email>b@edevau.net</email>
    <name>Andreas Billmeier</name>
  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jsonrpc-websocket</remote-id>
+    <maintainer status="unknown">
+      <email>emily@emlove.me</email>
+      <name>Emily Mills</name>
+    </maintainer>
+  </upstream>
 </pkgmetadata>