[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 7f30b0df10357f8ca82e86bbc30e5d5aa5a1fc65 Author: Michał Górny gentoo org> AuthorDate: Mon Jul 5 13:12:17 2021 + Commit: Michał Górny gentoo org> CommitDate: Mon Jul 5 13:25:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f30b0df dev-python/ws4py: Remove stale dep on unittest2 Signed-off-by: Michał Górny gentoo.org> dev-python/ws4py/ws4py-0.5.1-r1.ebuild | 1 - dev-python/ws4py/ws4py-.ebuild | 1 - 2 files changed, 2 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild index 94d185d8670..dbf1c8a54b9 100644 --- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild @@ -40,7 +40,6 @@ RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] DEPEND="test? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )" diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-.ebuild index 5d471f0ff14..d38a767a08c 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-.ebuild @@ -40,7 +40,6 @@ RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] DEPEND="test? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 410c96167901662df104df0aeadf9c53476b8d37 Author: Sam James gentoo org> AuthorDate: Sat Feb 27 21:20:48 2021 + Commit: Sam James gentoo org> CommitDate: Sat Feb 27 21:39:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410c9616 dev-python/ws4py: add Python 3.9 Signed-off-by: Sam James gentoo.org> dev-python/ws4py/ws4py-0.5.1-r1.ebuild | 12 dev-python/ws4py/ws4py-.ebuild | 12 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild index 66d94c727f0..94d185d8670 100644 --- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # We could depend on dev-python/cherrypy when USE=server, but @@ -7,12 +7,14 @@ # pypy is viable but better with a cutdown set of deps EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) + +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="threads(+)?" MY_PN="WebSocket-for-Python" inherit distutils-r1 + if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git; inherit git-r3 @@ -42,11 +44,13 @@ DEPEND="test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )" -PATCHES=( "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch +) python_test() { # testsuite displays an issue with mock under py3 but is non fatal - "${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}" + "${EPYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}" } python_install() { diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-.ebuild index 3561e1388c9..5d471f0ff14 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # We could depend on dev-python/cherrypy when USE=server, but @@ -7,12 +7,14 @@ # pypy is viable but better with a cutdown set of deps EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) + +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="threads(+)?" MY_PN="WebSocket-for-Python" inherit distutils-r1 + if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git; inherit git-r3 @@ -42,11 +44,13 @@ DEPEND="test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )" -PATCHES=( "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch +) python_test() { # testsuite displays an issue with mock under py3 but is non fatal - "${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}" + "${EPYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}" } python_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/, dev-python/ws4py/files/
commit: 60fc34833dbfa8c3392501d5c29ba8b2781b7013 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 30 21:07:31 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Jul 30 21:14:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fc3483 dev-python/ws4py: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/ws4py/Manifest | 1 - dev-python/ws4py/files/ws4py-0.3.4-tests.patch | 67 -- dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 55 - 3 files changed, 123 deletions(-) diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest index 73f87f82749..7f62255c2b2 100644 --- a/dev-python/ws4py/Manifest +++ b/dev-python/ws4py/Manifest @@ -1,2 +1 @@ -DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11 diff --git a/dev-python/ws4py/files/ws4py-0.3.4-tests.patch b/dev-python/ws4py/files/ws4py-0.3.4-tests.patch deleted file mode 100644 index dde60f2ed04..000 --- a/dev-python/ws4py/files/ws4py-0.3.4-tests.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 185c88cb6779b3b15a5c14047bb62b8fcb8d2e57 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 10 Mar 2018 00:33:37 +0100 -Subject: [PATCH] Fix AttributeErrors from mistaken Mock.assert_call_once_with - -This commit is a backport/subset of: -https://github.com/Lawouach/WebSocket-for-Python/commit/b5d47f7b3497f1b713a20fe6306b7d9afdd8c408 - test/test_manager.py | 12 ++-- - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/test/test_manager.py b/test/test_manager.py -index 8c229b0..aacc162 100644 a/test/test_manager.py -+++ b/test/test_manager.py -@@ -16,10 +16,10 @@ class WSManagerTest(unittest.TestCase): - ws.sock.fileno.return_value = 1 - - m.add(ws) --m.poller.register.assert_call_once_with(ws) -+m.poller.register.assert_called_once_with(1) - - m.remove(ws) --m.poller.unregister.assert_call_once_with(ws) -+m.poller.unregister.assert_called_once_with(1) - - @patch('ws4py.manager.SelectPoller') - def test_cannot_add_websocket_more_than_once(self, MockSelectPoller): -@@ -49,7 +49,7 @@ class WSManagerTest(unittest.TestCase): - self.assertEqual(len(m), 1) - m.remove(ws) - self.assertEqual(len(m), 0) --m.poller.unregister.assert_call_once_with(ws) -+m.poller.unregister.assert_called_once_with(1) - m.poller.reset_mock() - - m.remove(ws) -@@ -98,7 +98,7 @@ class WSManagerTest(unittest.TestCase): - m.add(ws) - m.start() - --ws.terminate.assert_call_once_with() -+ws.terminate.assert_called_once_with() - - m.stop() - -@@ -109,7 +109,7 @@ class WSManagerTest(unittest.TestCase): - ws = MagicMock() - m.add(ws) - m.close_all() --ws.terminate.assert_call_once_with(1001, 'Server is shutting down') -+ws.close.assert_called_once_with(code=1001, reason='Server is shutting down') - - @patch('ws4py.manager.SelectPoller') - def test_broadcast(self, MockSelectPoller): -@@ -120,7 +120,7 @@ class WSManagerTest(unittest.TestCase): - m.add(ws) - - m.broadcast(b'hello there') --ws.send.assert_call_once_with(b'hello there') -+ws.send.assert_called_once_with(b'hello there', False) - - @patch('ws4py.manager.SelectPoller') - def test_broadcast_failure_must_not_break_caller(self, MockSelectPoller): --- -2.16.2 - diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild deleted file mode 100644 index d6697eff1d2..000 --- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# We could depend on dev-python/cherrypy when USE=server, but -# that is an optional component ... -# Same for www-servers/tornado and USE=client ... so why not??? -# pypy is viable but better with a cutdown set of deps - -EAPI=5 -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="threads?" - -inherit distutils-r1 -if [[ ${PV} == ** ]] ; then - EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-r3 -else - inherit vcs-snapshot -
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 1c4b1d30a208e9541b05c2596e17a36932c24343 Author: Michał Górny gentoo org> AuthorDate: Sun Jul 12 16:46:04 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Jul 12 16:56:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4b1d30 dev-python/ws4py: Remove redundant versions Signed-off-by: Michał Górny gentoo.org> dev-python/ws4py/ws4py-0.5.1.ebuild | 51 - 1 file changed, 51 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild deleted file mode 100644 index 38507310ab2..000 --- a/dev-python/ws4py/ws4py-0.5.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# We could depend on dev-python/cherrypy when USE=server, but -# that is an optional component ... -# Same for www-servers/tornado and USE=client ... so why not??? -# pypy is viable but better with a cutdown set of deps - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="threads?" - -inherit distutils-r1 -if [[ ${PV} == "" ]] ; then - EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-r3 -else - inherit vcs-snapshot - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm x86" -fi - -DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy" -HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python; - -LICENSE="BSD" -SLOT="0" -IUSE="+client +server test +threads" -RESTRICT="!test? ( test )" -# doc build requires sphinxcontrib ext packages absent from portage - -RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] - >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] - client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] ) - server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )" -DEPEND="test? ( - >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - )" - -python_test() { - # testsuite displays an issue with mock under py3 but is non fatal - "${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install - use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client - use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server -}
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 7ed7619854fad52e21e60781b2dd9acc57c3 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jun 30 06:34:10 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jun 30 06:34:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed76198 dev-python/ws4py: x86 stable wrt bug #722240 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-python/ws4py/ws4py-0.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild index 8fa2990a4f6..a2d3891f3f0 100644 --- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == "" ]] ; then inherit git-r3 else SRC_URI="https://github.com/Lawouach/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~x86" + KEYWORDS="amd64 arm x86" S="${WORKDIR}/${MY_PN}-${PV}" fi
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 10c2ef652fd43261e4d554824ed56b3c9b82df29 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon May 25 06:28:51 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon May 25 06:28:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c2ef65 dev-python/ws4py: amd64 stable wrt bug #722240 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-python/ws4py/ws4py-0.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild index 3e590bb7984..8fa2990a4f6 100644 --- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == "" ]] ; then inherit git-r3 else SRC_URI="https://github.com/Lawouach/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 arm ~x86" + KEYWORDS="amd64 arm ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: b018ba0ae6bd6596455dd69939f9b3fa5e93de35 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu May 21 14:54:53 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu May 21 14:54:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b018ba0a dev-python/ws4py: fix $S Closes: https://bugs.gentoo.org/723188 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> dev-python/ws4py/ws4py-0.5.1-r1.ebuild | 7 +-- dev-python/ws4py/ws4py-.ebuild | 9 ++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild index 558868593e6..3e590bb7984 100644 --- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild @@ -10,13 +10,16 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)?" +MY_PN="WebSocket-for-Python" + inherit distutils-r1 if [[ ${PV} == "" ]] ; then - EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; + EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git; inherit git-r3 else - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/Lawouach/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 arm ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy" diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-.ebuild index 21de5cde42d..3e590bb7984 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-.ebuild @@ -10,13 +10,16 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)?" +MY_PN="WebSocket-for-Python" + inherit distutils-r1 if [[ ${PV} == "" ]] ; then - EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; + EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git; inherit git-r3 else - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://github.com/Lawouach/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 arm ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 1bca216e744fd54f6d67488bea31f6c15fbef586 Author: Mikle Kolyada gentoo org> AuthorDate: Sat May 16 11:26:45 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat May 16 11:26:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bca216e dev-python/ws4py: arm stable wrt bug #722240 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="arm" Signed-off-by: Mikle Kolyada gentoo.org> dev-python/ws4py/ws4py-0.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild index 21de5cde42d..558868593e6 100644 --- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "" ]] ; then inherit git-r3 else SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 arm ~x86" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/, dev-python/ws4py/files/
commit: 5d6ab607b4a4c0c80ebb2be419f76220d539aaf2 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 10 12:00:58 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 10 13:01:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d6ab607 dev-python/ws4py: rev bump for Py3.7/3.8 compatibility Had to drop keywords because dev-python/cherrypy with Py3.7/3.8 support isn't ready for arm. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> .../ws4py-0.5.1-python3.7+-compatibility.patch | 93 ++ .../{ws4py-.ebuild => ws4py-0.5.1-r1.ebuild} | 16 ++-- dev-python/ws4py/ws4py-.ebuild | 16 ++-- 3 files changed, 111 insertions(+), 14 deletions(-) diff --git a/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch b/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch new file mode 100644 index 000..12b14111634 --- /dev/null +++ b/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch @@ -0,0 +1,93 @@ +From: Matthias Klose +Date: Sun, 29 Jul 2018 09:01:36 +0200 +Subject: Fix compatibility with Python 3.7. +Origin: http://launchpadlibrarian.net/380629852/python-ws4py_0.4.2+dfsg1-2_0.4.2+dfsg1-2ubuntu1.diff.gz +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903529 + +--- + test/autobahn_test_servers.py | 4 ++-- + ws4py/async_websocket.py | 9 +++-- + ws4py/server/tulipserver.py | 7 ++- + 3 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/test/autobahn_test_servers.py b/test/autobahn_test_servers.py +index 3e33f82..8b77954 100644 +--- a/test/autobahn_test_servers.py b/test/autobahn_test_servers.py +@@ -142,7 +142,7 @@ def run_python_wsgi(host="127.0.0.1", port=9002): + """ + run_python_wsgi_async(host, port, False) + +-def run_python_wsgi_async(host="127.0.0.1", port=9010, async=True): ++def run_python_wsgi_async(host="127.0.0.1", port=9010, async_=True): + """ + Runs wsgi server on python 2.x with async middleware" + """ +@@ -153,7 +153,7 @@ def run_python_wsgi_async(host="127.0.0.1", port=9010, async=True): + from ws4py.server.wsgiutils import WebSocketWSGIApplication + + app = WebSocketWSGIApplication(handler_cls=EchoWebSocket) +-if async: ++if async_: + def middleware(app): + def later(environ, start_response): + for part in app(environ, start_response): +diff --git a/ws4py/async_websocket.py b/ws4py/async_websocket.py +index 9e2a4c7..096763d 100644 +--- a/ws4py/async_websocket.py b/ws4py/async_websocket.py +@@ -18,6 +18,11 @@ delegated_generator_websocket_on_top_of_asyncio.py + import asyncio + import types + ++try: # pragma: no cover ++asyncio_ensure_future = asyncio.ensure_future# Python >= 3.5 ++except AttributeError: # pragma: no cover ++asyncio_ensure_future = getattr(asyncio, 'async')# Python < 3.5 ++ + from ws4py.websocket import WebSocket as _WebSocket + from ws4py.messaging import Message + +@@ -84,7 +89,7 @@ class WebSocket(_WebSocket): + def closeit(): + yield from self.proto.writer.drain() + self.proto.writer.close() +-asyncio.async(closeit()) ++asyncio.asyncio_ensure_future(closeit()) + + def _write(self, data): + """ +@@ -94,7 +99,7 @@ class WebSocket(_WebSocket): + def sendit(data): + self.proto.writer.write(data) + yield from self.proto.writer.drain() +-asyncio.async(sendit(data)) ++asyncio.asyncio_ensure_future(sendit(data)) + + @asyncio.coroutine + def run(self): +diff --git a/ws4py/server/tulipserver.py b/ws4py/server/tulipserver.py +index 2786c16..ce2e9fb 100644 +--- a/ws4py/server/tulipserver.py b/ws4py/server/tulipserver.py +@@ -6,6 +6,11 @@ import io + + import asyncio + ++try: # pragma: no cover ++asyncio_ensure_future = asyncio.ensure_future# Python >= 3.5 ++except AttributeError: # pragma: no cover ++asyncio_ensure_future = getattr(asyncio, 'async')# Python < 3.5 ++ + from ws4py import WS_KEY, WS_VERSION + from ws4py.exc import HandshakeError + from ws4py.websocket import WebSocket +@@ -40,7 +45,7 @@ class WebSocketProtocol(asyncio.StreamReaderProtocol): + #self.stream.set_transport(transport) + asyncio.StreamReaderProtocol.connection_made(self, transport) + # Let make it concurrent for others to tag along +-f = asyncio.async(self.handle_initial_handshake()) ++f = asyncio.asyncio_ensure_future(self.handle_initial_handshake()) + f.add_done_callback(self.terminated) + + @property diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: b9164d19501c343bed3f4da1286a1142b1db71f8 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 7 20:35:36 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Mar 7 20:37:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9164d19 dev-python/ws4py: add myself as maintainer Required for www-apps/nikola. Package-Manager: Portage-2.3.91, Repoman-2.3.20 Signed-off-by: Thomas Deutschmann gentoo.org> dev-python/ws4py/metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml index bfe3f09c78d..cb991999cfd 100644 --- a/dev-python/ws4py/metadata.xml +++ b/dev-python/ws4py/metadata.xml @@ -1,9 +1,9 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -pyt...@gentoo.org -Python + +whi...@gentoo.org +Thomas Deutschmann Install client modules
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: c9adbbfaa54f5ad4fb710b8a056b07e3d8cd04de Author: Michał Górny gentoo org> AuthorDate: Sun Jan 26 17:01:24 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Jan 26 17:11:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9adbbfa dev-python/ws4py: Remove Python 2 Signed-off-by: Michał Górny gentoo.org> dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 3 +-- dev-python/ws4py/ws4py-0.5.1.ebuild| 3 +-- dev-python/ws4py/ws4py-.ebuild | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild index 8637c490584..d6697eff1d2 100644 --- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild @@ -7,7 +7,7 @@ # pypy is viable but better with a cutdown set of deps EAPI=5 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) PYTHON_REQ_USE="threads?" inherit distutils-r1 @@ -30,7 +30,6 @@ RESTRICT="!test? ( test )" # doc build requires sphinxcontrib ext packages absent from portage RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] ) server? (
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: feaf5dc94fd78182e793d40b81064f40315afdac Author: David Seifert gentoo org> AuthorDate: Sun Dec 29 08:53:01 2019 + Commit: David Seifert gentoo org> CommitDate: Sun Dec 29 08:53:01 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feaf5dc9 dev-python/ws4py: Remove old Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> dev-python/ws4py/ws4py-0.3.4.ebuild | 52 - 1 file changed, 52 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild deleted file mode 100644 index 25713f224f7..000 --- a/dev-python/ws4py/ws4py-0.3.4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# We could depend on dev-python/cherrypy when USE=server, but -# that is an optional component ... -# Same for www-servers/tornado and USE=client ... so why not??? -# pypy is viable but better with a cutdown set of deps - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_5} ) -PYTHON_REQ_USE="threads?" - -inherit distutils-r1 -if [[ ${PV} == ** ]] ; then - EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-r3 -else - inherit vcs-snapshot - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz" - KEYWORDS="amd64 arm x86" -fi - -DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy" -HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python; - -LICENSE="BSD" -SLOT="0" -IUSE="+client +server test +threads" -RESTRICT="!test? ( test )" -# doc build requires sphinxcontrib ext packages absent from portage - -RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) - >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] - client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] ) - server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )" -DEPEND="test? ( - >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - )" - -python_test() { - # testsuite displays an issue with mock under py3 but is non fatal - "${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install - use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client - use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server -}
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 30d908c62c7b03bf238bb0fa1a3dc21b9a5fc972 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Aug 6 03:54:08 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Aug 6 03:54:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d908c6 dev-python/ws4py: arm stable wrt bug #658884 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-python/ws4py/ws4py-0.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild index 2cda31b943f..58f0a0684a8 100644 --- a/dev-python/ws4py/ws4py-0.5.1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "" ]] ; then else inherit vcs-snapshot SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm x86" + KEYWORDS="amd64 arm x86" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: ce9d4456fd09046992ba122fbbcbef8d5f46b200 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Jul 28 13:22:04 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Jul 28 13:24:47 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce9d4456 dev-python/ws4py: x86 stable (bug #658884) Package-Manager: Portage-2.3.43, Repoman-2.3.10 dev-python/ws4py/ws4py-0.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild index 54b81d3c3df..2cda31b943f 100644 --- a/dev-python/ws4py/ws4py-0.5.1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "" ]] ; then else inherit vcs-snapshot SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: bc83d7e85ca536b7d8e5019b748342f0c0f26c11 Author: Mikle Kolyada gentoo org> AuthorDate: Wed Jul 11 19:46:17 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed Jul 11 19:46:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc83d7e8 dev-python/ws4py: arm stable wrt bug #658884 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild index 45d9e82c92b..03ba7ddd0c6 100644 --- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == ** ]] ; then else inherit vcs-snapshot SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm x86" + KEYWORDS="amd64 arm x86" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: f9bf1a2cd8d2f3a051f9e568271ed7937b7aad31 Author: Mikle Kolyada gentoo org> AuthorDate: Wed Jul 11 19:45:32 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed Jul 11 19:46:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9bf1a2c dev-python/ws4py: x86 stable wrt bug #658884 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild index df97e39f5bf..45d9e82c92b 100644 --- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == ** ]] ; then else inherit vcs-snapshot SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 873ae38a2e9721e8a7e3563a57eec3c157830b4d Author: Jason Zaman gentoo org> AuthorDate: Sun Jun 24 12:48:05 2018 + Commit: Jason Zaman gentoo org> CommitDate: Sun Jun 24 12:48:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873ae38a dev-python/ws4py: amd64 stable Gentoo-bug: 658932 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild index ee738e5a273..df97e39f5bf 100644 --- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == ** ]] ; then else inherit vcs-snapshot SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm ~x86" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 64725c1b6ce316410fff960ba4ea4b9c5224 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Jun 24 09:39:13 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Jun 24 09:39:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64725c1b dev-python/ws4py: amd64 stable wrt bug #658884 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-python/ws4py/ws4py-0.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild index b8797e5d415..54b81d3c3df 100644 --- a/dev-python/ws4py/ws4py-0.5.1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "" ]] ; then else inherit vcs-snapshot SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm ~x86" fi DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 05247111fba146d1ca3f5c1bf460d3cd0b0eca8d Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 27 18:55:43 2018 + Commit: Michał Górny gentoo org> CommitDate: Sun Apr 29 10:29:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05247111 dev-python/ws4py: git-2->git-r3 Package-Manager: Portage-2.3.31, Repoman-2.3.9 dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 10 +- dev-python/ws4py/ws4py-0.3.4.ebuild| 10 +- dev-python/ws4py/ws4py-0.5.1.ebuild| 4 ++-- dev-python/ws4py/ws4py-.ebuild | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild index 6ab67dfda7d..ee738e5a273 100644 --- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild @@ -6,17 +6,17 @@ # Same for www-servers/tornado and USE=client ... so why not??? # pypy is viable but better with a cutdown set of deps -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE="threads?" inherit distutils-r1 -if [[ ${PV} == "" ]] ; then +if [[ ${PV} == ** ]] ; then EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-2 + inherit git-r3 else inherit vcs-snapshot - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz" + SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi @@ -40,7 +40,7 @@ DEPEND="test? ( )" PATCHES=( - "${FILESDIR}"/${P}-tests.patch + "${FILESDIR}"/${PN}-0.3.4-tests.patch ) python_test() { diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild index a7084914ad6..72726e9eda1 100644 --- a/dev-python/ws4py/ws4py-0.3.4.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # We could depend on dev-python/cherrypy when USE=server, but @@ -6,17 +6,17 @@ # Same for www-servers/tornado and USE=client ... so why not??? # pypy is viable but better with a cutdown set of deps -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_7,3_4,3_5} ) PYTHON_REQ_USE="threads?" inherit distutils-r1 -if [[ ${PV} == "" ]] ; then +if [[ ${PV} == ** ]] ; then EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-2 + inherit git-r3 else inherit vcs-snapshot - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz" + SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz" KEYWORDS="amd64 arm x86" fi diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild index c1c647c9a5e..b8797e5d415 100644 --- a/dev-python/ws4py/ws4py-0.5.1.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1.ebuild @@ -6,14 +6,14 @@ # Same for www-servers/tornado and USE=client ... so why not??? # pypy is viable but better with a cutdown set of deps -EAPI="6" +EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE="threads?" inherit distutils-r1 if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-3 + inherit git-r3 else inherit vcs-snapshot SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-.ebuild index 74386cac1ba..b8797e5d415 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-.ebuild @@ -6,7 +6,7 @@ # Same for www-servers/tornado and USE=client ... so why not??? # pypy is viable but better with a cutdown set of deps -EAPI="6" +EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE="threads?"
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/files/, dev-python/ws4py/
commit: 8c65658fe72ebed4fadd184d74f554f4405b0d7e Author: Sebastian Pipping gentoo org> AuthorDate: Fri Mar 9 23:38:25 2018 + Commit: Sebastian Pipping gentoo org> CommitDate: Fri Mar 9 23:42:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c65658f dev-python/ws4py: Python 3.6 (for 0.3.4) Bug: https://bugs.gentoo.org/643732 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-python/ws4py/files/ws4py-0.3.4-tests.patch | 67 ++ dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 55 + 2 files changed, 122 insertions(+) diff --git a/dev-python/ws4py/files/ws4py-0.3.4-tests.patch b/dev-python/ws4py/files/ws4py-0.3.4-tests.patch new file mode 100644 index 000..dde60f2ed04 --- /dev/null +++ b/dev-python/ws4py/files/ws4py-0.3.4-tests.patch @@ -0,0 +1,67 @@ +From 185c88cb6779b3b15a5c14047bb62b8fcb8d2e57 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping+Date: Sat, 10 Mar 2018 00:33:37 +0100 +Subject: [PATCH] Fix AttributeErrors from mistaken Mock.assert_call_once_with + +This commit is a backport/subset of: +https://github.com/Lawouach/WebSocket-for-Python/commit/b5d47f7b3497f1b713a20fe6306b7d9afdd8c408 +--- + test/test_manager.py | 12 ++-- + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/test_manager.py b/test/test_manager.py +index 8c229b0..aacc162 100644 +--- a/test/test_manager.py b/test/test_manager.py +@@ -16,10 +16,10 @@ class WSManagerTest(unittest.TestCase): + ws.sock.fileno.return_value = 1 + + m.add(ws) +-m.poller.register.assert_call_once_with(ws) ++m.poller.register.assert_called_once_with(1) + + m.remove(ws) +-m.poller.unregister.assert_call_once_with(ws) ++m.poller.unregister.assert_called_once_with(1) + + @patch('ws4py.manager.SelectPoller') + def test_cannot_add_websocket_more_than_once(self, MockSelectPoller): +@@ -49,7 +49,7 @@ class WSManagerTest(unittest.TestCase): + self.assertEqual(len(m), 1) + m.remove(ws) + self.assertEqual(len(m), 0) +-m.poller.unregister.assert_call_once_with(ws) ++m.poller.unregister.assert_called_once_with(1) + m.poller.reset_mock() + + m.remove(ws) +@@ -98,7 +98,7 @@ class WSManagerTest(unittest.TestCase): + m.add(ws) + m.start() + +-ws.terminate.assert_call_once_with() ++ws.terminate.assert_called_once_with() + + m.stop() + +@@ -109,7 +109,7 @@ class WSManagerTest(unittest.TestCase): + ws = MagicMock() + m.add(ws) + m.close_all() +-ws.terminate.assert_call_once_with(1001, 'Server is shutting down') ++ws.close.assert_called_once_with(code=1001, reason='Server is shutting down') + + @patch('ws4py.manager.SelectPoller') + def test_broadcast(self, MockSelectPoller): +@@ -120,7 +120,7 @@ class WSManagerTest(unittest.TestCase): + m.add(ws) + + m.broadcast(b'hello there') +-ws.send.assert_call_once_with(b'hello there') ++ws.send.assert_called_once_with(b'hello there', False) + + @patch('ws4py.manager.SelectPoller') + def test_broadcast_failure_must_not_break_caller(self, MockSelectPoller): +-- +2.16.2 + diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild new file mode 100644 index 000..6ab67dfda7d --- /dev/null +++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# We could depend on dev-python/cherrypy when USE=server, but +# that is an optional component ... +# Same for www-servers/tornado and USE=client ... so why not??? +# pypy is viable but better with a cutdown set of deps + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE="threads?" + +inherit distutils-r1 +if [[ ${PV} == "" ]] ; then + EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; + inherit git-2 +else + inherit vcs-snapshot + SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy" +HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python; + +LICENSE="BSD" +SLOT="0" +IUSE="+client +server test +threads" +# doc build requires sphinxcontrib ext packages absent from portage + +RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) + >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] + client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] ) + server? (
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 649521b6086fd4dbb096a0af8a67b433557dd532 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 3 01:34:48 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Mar 3 02:07:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649521b6 dev-python/ws4py: Bump to v0.5.1 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-python/ws4py/Manifest | 1 + dev-python/ws4py/{ws4py-.ebuild => ws4py-0.5.1.ebuild} | 10 +- dev-python/ws4py/ws4py-.ebuild | 10 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest index 3af3e8f45fd..73f87f82749 100644 --- a/dev-python/ws4py/Manifest +++ b/dev-python/ws4py/Manifest @@ -1 +1,2 @@ DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f +DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11 diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild similarity index 88% copy from dev-python/ws4py/ws4py-.ebuild copy to dev-python/ws4py/ws4py-0.5.1.ebuild index 757d4a7a3ea..c1c647c9a5e 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-0.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # We could depend on dev-python/cherrypy when USE=server, but @@ -6,17 +6,17 @@ # Same for www-servers/tornado and USE=client ... so why not??? # pypy is viable but better with a cutdown set of deps -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +EAPI="6" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE="threads?" inherit distutils-r1 if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-2 + inherit git-3 else inherit vcs-snapshot - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz" + SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-.ebuild index 757d4a7a3ea..74386cac1ba 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # We could depend on dev-python/cherrypy when USE=server, but @@ -6,17 +6,17 @@ # Same for www-servers/tornado and USE=client ... so why not??? # pypy is viable but better with a cutdown set of deps -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +EAPI="6" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE="threads?" inherit distutils-r1 if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; - inherit git-2 + inherit git-r3 else inherit vcs-snapshot - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz" + SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 14fda2f301ce495cdc2c2c0393fc71886d62913f Author: David Hicks hicks id au> AuthorDate: Sat Jul 29 10:18:51 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Jul 30 09:15:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fda2f3 dev-python/ws4py: use HTTPS for GitHub Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-python/ws4py/ws4py-0.3.4.ebuild | 4 ++-- dev-python/ws4py/ws4py-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild index 5a8c71a7efa..a7084914ad6 100644 --- a/dev-python/ws4py/ws4py-0.3.4.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # We could depend on dev-python/cherrypy when USE=server, but @@ -12,7 +12,7 @@ PYTHON_REQ_USE="threads?" inherit distutils-r1 if [[ ${PV} == "" ]] ; then - EGIT_REPO_URI="git://github.com/Lawouach/WebSocket-for-Python.git" + EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; inherit git-2 else inherit vcs-snapshot diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-.ebuild index af74ee92a52..757d4a7a3ea 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # We could depend on dev-python/cherrypy when USE=server, but @@ -12,7 +12,7 @@ PYTHON_REQ_USE="threads?" inherit distutils-r1 if [[ ${PV} == "" ]] ; then - EGIT_REPO_URI="git://github.com/Lawouach/WebSocket-for-Python.git" + EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git; inherit git-2 else inherit vcs-snapshot
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/files/
commit: 90ea17a95c9e556b9f7cbea9d25f2f4ff58b2e8d Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Sep 20 16:57:27 2016 + Commit: David Seifert gentoo org> CommitDate: Tue Sep 20 21:07:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ea17a9 dev-python/ws4py: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/2376 Signed-off-by: David Seifert gentoo.org> .../ws4py/files/ws4py-0.2-cherrypy_test.patch | 24 --- .../ws4py/files/ws4py-0.2.1-process-data.patch | 27 -- 2 files changed, 51 deletions(-) diff --git a/dev-python/ws4py/files/ws4py-0.2-cherrypy_test.patch b/dev-python/ws4py/files/ws4py-0.2-cherrypy_test.patch deleted file mode 100644 index e1d55af.. --- a/dev-python/ws4py/files/ws4py-0.2-cherrypy_test.patch +++ /dev/null @@ -1,24 +0,0 @@ -db23aff2ea commit 4ec8638c268ecdb710d97176a55cc5b818aa1a18 -https://github.com/Lawouach/WebSocket-for-Python/issues/72 -diff -ur ws4py-0.2.4.orig/test/test_cherrypy.py ws4py-0.2.4/test/test_cherrypy.py test/test_cherrypy.py 2012-12-14 03:35:48.0 +0800 -+++ test/test_cherrypy.py 2013-01-11 16:56:37.34011 +0800 -@@ -4,6 +4,7 @@ - import cherrypy - from ws4py.server.cherrypyserver import WebSocketPlugin, WebSocketTool - from ws4py.websocket import EchoWebSocket -+from ws4py.compat import py3k - - class FakeSocket(object): - def settimeout(self, timeout): -@@ -65,7 +66,10 @@ - h = EchoWebSocket(s, [], []) - cherrypy.engine.publish('handle-websocket', h, ('127.0.0.1', 0)) - self.assertEquals(len(cherrypy.engine.websocket.pool), 1) --k = cherrypy.engine.websocket.pool.keys()[0] -+if py3k: -+k = list(cherrypy.engine.websocket.pool.keys())[0] -+else: -+k = cherrypy.engine.websocket.pool.keys()[0] - self.assertTrue(k is h) - self.assertEquals(cherrypy.engine.websocket.pool[k][1], ('127.0.0.1', 0)) diff --git a/dev-python/ws4py/files/ws4py-0.2.1-process-data.patch b/dev-python/ws4py/files/ws4py-0.2.1-process-data.patch deleted file mode 100644 index 5476f2d.. --- a/dev-python/ws4py/files/ws4py-0.2.1-process-data.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 38cf669e27fab9de187eb11dabd7d85d73d5f470 Mon Sep 17 00:00:00 2001 -From: Jon Salz-Date: Fri, 20 Apr 2012 02:22:46 +0800 -Subject: [PATCH] Process remaining bytes in the body, if any. - -https://github.com/Lawouach/WebSocket-for-Python/issues/46 - ws4py/client/__init__.py |3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/ws4py/client/__init__.py b/ws4py/client/__init__.py -index aa4c8f2..29b1357 100644 a/ws4py/client/__init__.py -+++ b/ws4py/client/__init__.py -@@ -71,6 +71,9 @@ class WebSocketBaseClient(WebSocket): - - self.handshake_ok() - -+if body != '': -+self.process(body) -+ - @property - def handshake_headers(self): - parts = urlsplit(self.url) --- -1.7.3.4 -
[gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/
commit: 0ff22c94a4a152763f6c1ae7d1c6d4d200a9719c Author: Alexis Ballier gentoo org> AuthorDate: Thu Sep 15 07:48:33 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Sep 15 07:52:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff22c94 dev-python/ws4py: add python 3.5 to compat Package-Manager: portage-2.3.0 dev-python/ws4py/ws4py-0.3.4.ebuild | 4 ++-- dev-python/ws4py/ws4py-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild index fabf578..1b69f7b 100644 --- a/dev-python/ws4py/ws4py-0.3.4.ebuild +++ b/dev-python/ws4py/ws4py-0.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ # pypy is viable but better with a cutdown set of deps EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) PYTHON_REQ_USE="threads?" inherit distutils-r1 diff --git a/dev-python/ws4py/ws4py-.ebuild b/dev-python/ws4py/ws4py-.ebuild index 7b17719..187f0d7 100644 --- a/dev-python/ws4py/ws4py-.ebuild +++ b/dev-python/ws4py/ws4py-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ # pypy is viable but better with a cutdown set of deps EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) PYTHON_REQ_USE="threads?" inherit distutils-r1