Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ws4py/, dev-python/ws4py/files/
Date: Thu, 30 Jul 2020 21:14:31
Message-Id: 1596143662.60fc34833dbfa8c3392501d5c29ba8b2781b7013.mgorny@gentoo
1 commit: 60fc34833dbfa8c3392501d5c29ba8b2781b7013
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 30 21:07:31 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 21:14:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fc3483
7
8 dev-python/ws4py: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/ws4py/Manifest | 1 -
13 dev-python/ws4py/files/ws4py-0.3.4-tests.patch | 67 --------------------------
14 dev-python/ws4py/ws4py-0.3.4-r1.ebuild | 55 ---------------------
15 3 files changed, 123 deletions(-)
16
17 diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
18 index 73f87f82749..7f62255c2b2 100644
19 --- a/dev-python/ws4py/Manifest
20 +++ b/dev-python/ws4py/Manifest
21 @@ -1,2 +1 @@
22 -DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f
23 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
24
25 diff --git a/dev-python/ws4py/files/ws4py-0.3.4-tests.patch b/dev-python/ws4py/files/ws4py-0.3.4-tests.patch
26 deleted file mode 100644
27 index dde60f2ed04..00000000000
28 --- a/dev-python/ws4py/files/ws4py-0.3.4-tests.patch
29 +++ /dev/null
30 @@ -1,67 +0,0 @@
31 -From 185c88cb6779b3b15a5c14047bb62b8fcb8d2e57 Mon Sep 17 00:00:00 2001
32 -From: Sebastian Pipping <sebastian@×××××××.org>
33 -Date: Sat, 10 Mar 2018 00:33:37 +0100
34 -Subject: [PATCH] Fix AttributeErrors from mistaken Mock.assert_call_once_with
35 -
36 -This commit is a backport/subset of:
37 -https://github.com/Lawouach/WebSocket-for-Python/commit/b5d47f7b3497f1b713a20fe6306b7d9afdd8c408
38 ----
39 - test/test_manager.py | 12 ++++++------
40 - 1 file changed, 6 insertions(+), 6 deletions(-)
41 -
42 -diff --git a/test/test_manager.py b/test/test_manager.py
43 -index 8c229b0..aacc162 100644
44 ---- a/test/test_manager.py
45 -+++ b/test/test_manager.py
46 -@@ -16,10 +16,10 @@ class WSManagerTest(unittest.TestCase):
47 - ws.sock.fileno.return_value = 1
48 -
49 - m.add(ws)
50 -- m.poller.register.assert_call_once_with(ws)
51 -+ m.poller.register.assert_called_once_with(1)
52 -
53 - m.remove(ws)
54 -- m.poller.unregister.assert_call_once_with(ws)
55 -+ m.poller.unregister.assert_called_once_with(1)
56 -
57 - @patch('ws4py.manager.SelectPoller')
58 - def test_cannot_add_websocket_more_than_once(self, MockSelectPoller):
59 -@@ -49,7 +49,7 @@ class WSManagerTest(unittest.TestCase):
60 - self.assertEqual(len(m), 1)
61 - m.remove(ws)
62 - self.assertEqual(len(m), 0)
63 -- m.poller.unregister.assert_call_once_with(ws)
64 -+ m.poller.unregister.assert_called_once_with(1)
65 - m.poller.reset_mock()
66 -
67 - m.remove(ws)
68 -@@ -98,7 +98,7 @@ class WSManagerTest(unittest.TestCase):
69 - m.add(ws)
70 - m.start()
71 -
72 -- ws.terminate.assert_call_once_with()
73 -+ ws.terminate.assert_called_once_with()
74 -
75 - m.stop()
76 -
77 -@@ -109,7 +109,7 @@ class WSManagerTest(unittest.TestCase):
78 - ws = MagicMock()
79 - m.add(ws)
80 - m.close_all()
81 -- ws.terminate.assert_call_once_with(1001, 'Server is shutting down')
82 -+ ws.close.assert_called_once_with(code=1001, reason='Server is shutting down')
83 -
84 - @patch('ws4py.manager.SelectPoller')
85 - def test_broadcast(self, MockSelectPoller):
86 -@@ -120,7 +120,7 @@ class WSManagerTest(unittest.TestCase):
87 - m.add(ws)
88 -
89 - m.broadcast(b'hello there')
90 -- ws.send.assert_call_once_with(b'hello there')
91 -+ ws.send.assert_called_once_with(b'hello there', False)
92 -
93 - @patch('ws4py.manager.SelectPoller')
94 - def test_broadcast_failure_must_not_break_caller(self, MockSelectPoller):
95 ---
96 -2.16.2
97 -
98
99 diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
100 deleted file mode 100644
101 index d6697eff1d2..00000000000
102 --- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
103 +++ /dev/null
104 @@ -1,55 +0,0 @@
105 -# Copyright 1999-2020 Gentoo Authors
106 -# Distributed under the terms of the GNU General Public License v2
107 -
108 -# We could depend on dev-python/cherrypy when USE=server, but
109 -# that is an optional component ...
110 -# Same for www-servers/tornado and USE=client ... so why not???
111 -# pypy is viable but better with a cutdown set of deps
112 -
113 -EAPI=5
114 -PYTHON_COMPAT=( python3_6 )
115 -PYTHON_REQ_USE="threads?"
116 -
117 -inherit distutils-r1
118 -if [[ ${PV} == *9999* ]] ; then
119 - EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
120 - inherit git-r3
121 -else
122 - inherit vcs-snapshot
123 - SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz"
124 - KEYWORDS="amd64 arm x86"
125 -fi
126 -
127 -DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
128 -HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
129 -
130 -LICENSE="BSD"
131 -SLOT="0"
132 -IUSE="+client +server test +threads"
133 -RESTRICT="!test? ( test )"
134 -# doc build requires sphinxcontrib ext packages absent from portage
135 -
136 -RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
137 - >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
138 - client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
139 - server? ( <dev-python/cherrypy-9[${PYTHON_USEDEP}] )"
140 -DEPEND="test? (
141 - <dev-python/cherrypy-9[${PYTHON_USEDEP}]
142 - dev-python/unittest2[${PYTHON_USEDEP}]
143 - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
144 - )"
145 -
146 -PATCHES=(
147 - "${FILESDIR}"/${PN}-0.3.4-tests.patch
148 -)
149 -
150 -python_test() {
151 - # testsuite displays an issue with mock under py3 but is non fatal
152 - "${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
153 -}
154 -
155 -python_install() {
156 - distutils-r1_python_install
157 - use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
158 - use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
159 -}