1 |
commit: a9b4f53713ecdd6859c7a3c75e3634415b694f43 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 2 22:04:33 2017 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 2 22:09:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b4f537 |
7 |
|
8 |
dev-python/bokeh: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
dev-python/bokeh/Manifest | 3 - |
14 |
dev-python/bokeh/bokeh-0.10.0.ebuild | 62 ------------------ |
15 |
dev-python/bokeh/bokeh-0.11.0.ebuild | 59 ----------------- |
16 |
dev-python/bokeh/bokeh-0.7.1.ebuild | 90 -------------------------- |
17 |
dev-python/bokeh/files/bokeh-0.7.1-setup.patch | 17 ----- |
18 |
5 files changed, 231 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest |
21 |
index e988597..dc0bf9d 100644 |
22 |
--- a/dev-python/bokeh/Manifest |
23 |
+++ b/dev-python/bokeh/Manifest |
24 |
@@ -1,4 +1 @@ |
25 |
-DIST bokeh-0.10.0.tar.gz 4474129 SHA256 2d8bd8c98e2f62b2a28328d3cc95bfbe257742fa7efc9c382b4c8ae4a141df14 SHA512 19023f1e67245005581b8640380045a8795747da75025478881f9d3791e82289ee75b74142b38a0bae9c236c0b1b6df1629376d5c3fcc319ceafb0a4abc7240f WHIRLPOOL 86e8e3774287164d2d7da0a04ceddb62eb03a19e48c82acf806c1a356d361f655bd6087f15b740ab36b84891ed849435e2a9c6098e881f07299cce8553d88fb2 |
26 |
-DIST bokeh-0.11.0.tar.gz 4918634 SHA256 0f3637cb2594953327e2c2e54dff75d3914647ffa6c6daec96c812042fa2d8a8 SHA512 98920ae2ad83a421aa252fda5c07a401421e2959b551ec9c984f236f39a1986a14d83da01406ce0a1a3745abb03a7ff5533a3619cf537a7fcafffce8a024c762 WHIRLPOOL 2c67974661d69f91c8f8c46619800136c12e5f2453e955e885f3ac0e9dc43b270b45ff42cccd77f146a3c7b697faede318bf04a713637a784446387d6df785da |
27 |
DIST bokeh-0.11.1.tar.gz 3383140 SHA256 34a73d8f68e7d6faaecc9f785cac8e9f76b88a7e7aacf66307076b03b4d3c472 SHA512 18cfee85698f1ba548c34fb223dc57e36584951064e65fac83cb8388b129914a8f67970a133ef2d1a67c06e50cbfb565a27d33dc9c90f5027a1739d400894706 WHIRLPOOL 5f8aa63f90e95945b7c1e1770d869ee7b8aee34d07f6f254586de5d30561b1688f5390f688f9792627809229fb93fcf607a012dc5e070a5c8f7c95b84dd8db4d |
28 |
-DIST bokeh-0.7.1.tar.gz 30039486 SHA256 167125e07df2ea1f65b1b6dfed140b7b6ed7452a1182ad4cb0be2580af537f73 SHA512 cf2ee6457cab7ca0a98c2cf19a7814e081245b30cf6f4f4670f8fc60b216bb39f14d3cdf52c92f85635cbf6419db00c0c01adb2e1a6eeaa019cdc767c642c160 WHIRLPOOL 23e66370f1cab2d3a3c40b0713e5cdb50afa7aeec1c2d1172a1d9a5598c004dd351509973ac84f24ebb30dbc5a86de455e1dfcbe00daf6a1d12c3e336122a2b8 |
29 |
|
30 |
diff --git a/dev-python/bokeh/bokeh-0.10.0.ebuild b/dev-python/bokeh/bokeh-0.10.0.ebuild |
31 |
deleted file mode 100644 |
32 |
index 540b9bd..00000000 |
33 |
--- a/dev-python/bokeh/bokeh-0.10.0.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,62 +0,0 @@ |
36 |
-# Copyright 1999-2015 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
-# $Id$ |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
43 |
- |
44 |
-inherit distutils-r1 |
45 |
- |
46 |
-DESCRIPTION="Statistical and novel interactive HTML plots for Python" |
47 |
-HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh" |
48 |
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" |
49 |
- |
50 |
-LICENSE="BSD" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
53 |
-IUSE="examples test" |
54 |
- |
55 |
-# A doc build requires napoleon sphinx extension which will be included in sphinx release 1.3 |
56 |
-# Therefore refraining from adding the doc build for now |
57 |
-RDEPEND=" |
58 |
- dev-python/abstract_rendering[${PYTHON_USEDEP}] |
59 |
- >=dev-python/colorama-0.2.7[${PYTHON_USEDEP}] |
60 |
- >=dev-python/flask-0.10.1[${PYTHON_USEDEP}] |
61 |
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}] |
62 |
- >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] |
63 |
- >=dev-python/pandas-0.11[${PYTHON_USEDEP}] |
64 |
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] |
65 |
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] |
66 |
- >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}] |
67 |
- >=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}] |
68 |
- >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] |
69 |
- >=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
70 |
- dev-python/websocket-client[${PYTHON_USEDEP}] |
71 |
- >=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}] |
72 |
- >=www-servers/tornado-4.0.1[${PYTHON_USEDEP}] |
73 |
- " |
74 |
-# testing server: needs websocket not in portage yet |
75 |
-# websocket is in pypi for the adding |
76 |
-# hdf5 backend: needs array management not in portage yet |
77 |
-DEPEND="${RDEPEND} |
78 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
79 |
- test? ( |
80 |
- dev-python/nose[${PYTHON_USEDEP}] |
81 |
- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7) |
82 |
- ) |
83 |
- " |
84 |
-python_test() { |
85 |
- cd "${BUILD_DIR}"/lib || die |
86 |
- # exclude server tests for now |
87 |
- nosetests -v \ |
88 |
- -e multiuser_auth_test \ |
89 |
- -e usermodel_test \ |
90 |
- || die |
91 |
-} |
92 |
- |
93 |
-python_install_all() { |
94 |
- use examples && local EXAMPLES=( examples/. ) |
95 |
- |
96 |
- distutils-r1_python_install_all |
97 |
-} |
98 |
|
99 |
diff --git a/dev-python/bokeh/bokeh-0.11.0.ebuild b/dev-python/bokeh/bokeh-0.11.0.ebuild |
100 |
deleted file mode 100644 |
101 |
index 48cd71a..00000000 |
102 |
--- a/dev-python/bokeh/bokeh-0.11.0.ebuild |
103 |
+++ /dev/null |
104 |
@@ -1,59 +0,0 @@ |
105 |
-# Copyright 1999-2016 Gentoo Foundation |
106 |
-# Distributed under the terms of the GNU General Public License v2 |
107 |
-# $Id$ |
108 |
- |
109 |
-EAPI=5 |
110 |
- |
111 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
112 |
- |
113 |
-inherit distutils-r1 |
114 |
- |
115 |
-DESCRIPTION="Statistical and novel interactive HTML plots for Python" |
116 |
-HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh" |
117 |
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" |
118 |
- |
119 |
-LICENSE="BSD" |
120 |
-SLOT="0" |
121 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
122 |
-IUSE="examples test" |
123 |
- |
124 |
-# A doc build requires napoleon sphinx extension which will be included in sphinx release 1.3 |
125 |
-# Therefore refraining from adding the doc build for now |
126 |
-RDEPEND=" |
127 |
- dev-python/abstract_rendering[${PYTHON_USEDEP}] |
128 |
- >=dev-python/colorama-0.2.7[${PYTHON_USEDEP}] |
129 |
- >=dev-python/flask-0.10.1[${PYTHON_USEDEP}] |
130 |
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}] |
131 |
- >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] |
132 |
- >=dev-python/pandas-0.11[${PYTHON_USEDEP}] |
133 |
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] |
134 |
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] |
135 |
- >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}] |
136 |
- >=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}] |
137 |
- >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] |
138 |
- >=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
139 |
- dev-python/websocket-client[${PYTHON_USEDEP}] |
140 |
- >=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}] |
141 |
- >=www-servers/tornado-4.0.1[${PYTHON_USEDEP}] |
142 |
- " |
143 |
-# testing server: needs websocket not in portage yet |
144 |
-# websocket is in pypi for the adding |
145 |
-# hdf5 backend: needs array management not in portage yet |
146 |
-DEPEND="${RDEPEND} |
147 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
148 |
- test? ( |
149 |
- dev-python/pytest[${PYTHON_USEDEP}] |
150 |
- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2*') |
151 |
- $(python_gen_cond_dep 'dev-python/flexx[${PYTHON_USEDEP}]' 'python3*') |
152 |
- )" |
153 |
- |
154 |
-python_test() { |
155 |
- cd "${BUILD_DIR}"/lib || die |
156 |
- py.test -m 'not (js or examples or integration)' -vv || die |
157 |
-} |
158 |
- |
159 |
-python_install_all() { |
160 |
- use examples && local EXAMPLES=( examples/. ) |
161 |
- |
162 |
- distutils-r1_python_install_all |
163 |
-} |
164 |
|
165 |
diff --git a/dev-python/bokeh/bokeh-0.7.1.ebuild b/dev-python/bokeh/bokeh-0.7.1.ebuild |
166 |
deleted file mode 100644 |
167 |
index 78e44f5..00000000 |
168 |
--- a/dev-python/bokeh/bokeh-0.7.1.ebuild |
169 |
+++ /dev/null |
170 |
@@ -1,90 +0,0 @@ |
171 |
-# Copyright 1999-2015 Gentoo Foundation |
172 |
-# Distributed under the terms of the GNU General Public License v2 |
173 |
-# $Id$ |
174 |
- |
175 |
-EAPI=5 |
176 |
- |
177 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
178 |
- |
179 |
-inherit distutils-r1 readme.gentoo |
180 |
- |
181 |
-DESCRIPTION="Statistical and interactive HTML plots for Python" |
182 |
-HOMEPAGE="http://bokeh.pydata.org/" |
183 |
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
184 |
- |
185 |
-SLOT="0" |
186 |
-LICENSE="BSD" |
187 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
188 |
-IUSE="examples test" |
189 |
- |
190 |
-# A doc build requires napoleon sphinx extension which will be included in sphinx release 1.3 |
191 |
-# Therefore refraining from adding the doc build for now |
192 |
-RDEPEND=" |
193 |
- >=dev-python/colorama-0.2.7[${PYTHON_USEDEP}] |
194 |
- >=dev-python/click-3.3[${PYTHON_USEDEP}] |
195 |
- >=dev-python/flask-0.10.1[${PYTHON_USEDEP}] |
196 |
- >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] |
197 |
- >=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}] |
198 |
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}] |
199 |
- >=dev-python/markdown-2.3.1[${PYTHON_USEDEP}] |
200 |
- >=dev-python/markupsafe-0.18[${PYTHON_USEDEP}] |
201 |
- >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] |
202 |
- >=dev-python/pandas-0.11[${PYTHON_USEDEP}] |
203 |
- >=dev-python/pygments-1.6[${PYTHON_USEDEP}] |
204 |
- >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] |
205 |
- >=dev-python/pystache-0.5.3[${PYTHON_USEDEP}] |
206 |
- >=dev-python/pytz-2013b[${PYTHON_USEDEP}] |
207 |
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] |
208 |
- >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}] |
209 |
- >=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}] |
210 |
- >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] |
211 |
- >=dev-python/six-1.5.2[${PYTHON_USEDEP}] |
212 |
- >=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}] |
213 |
- >=net-libs/nodejs-0.8.28[npm] |
214 |
- >=www-client/phantomjs-1.9.8 |
215 |
- >=www-servers/tornado-4.0.1[${PYTHON_USEDEP}] |
216 |
- $(python_gen_cond_dep '>=dev-python/gevent-1.0[${PYTHON_USEDEP}]' python2_7) |
217 |
- $(python_gen_cond_dep '>=dev-python/gevent-websocket-0.9.2[${PYTHON_USEDEP}]' python2_7) |
218 |
- " |
219 |
-# testing server: needs websocket not in portage yet |
220 |
-# websocket is in pypi for the adding |
221 |
-# hdf5 backend: needs array management not in portage yet |
222 |
-DEPEND=" |
223 |
- test? ( |
224 |
- ${RDEPEND} |
225 |
- >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] |
226 |
- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7) |
227 |
- >=dev-python/colorama-0.2.7[${PYTHON_USEDEP}] ) |
228 |
- " |
229 |
-DOCS=( CHANGELOG QUICKSTART.md README.md ) |
230 |
- |
231 |
-PATCHES=( "${FILESDIR}"/${P}-setup.patch ) |
232 |
- |
233 |
-python_prepare_all() { |
234 |
- DOC_CONTENTS="websockets work only with python2_7" |
235 |
- |
236 |
- sed -i -e "s/jsbuild = get_user_jsargs()/jsbuild = False/g" setup.py || die |
237 |
- cd bokehjs || die |
238 |
- npm install ||die |
239 |
- cd .. || die |
240 |
- esetup.py --build_js sdist |
241 |
- |
242 |
- distutils-r1_python_prepare_all |
243 |
-} |
244 |
- |
245 |
-python_install_all() { |
246 |
- readme.gentoo_create_doc |
247 |
- |
248 |
- use examples && local EXAMPLES=( examples/. ) |
249 |
- |
250 |
- distutils-r1_python_install_all |
251 |
-} |
252 |
- |
253 |
-python_test() { |
254 |
- cd "${BUILD_DIR}"/lib || die |
255 |
- # exclude server tests for now |
256 |
- nosetests -v \ |
257 |
- -e multiuser_auth_test \ |
258 |
- -e usermodel_test \ |
259 |
- || die |
260 |
-} |
261 |
|
262 |
diff --git a/dev-python/bokeh/files/bokeh-0.7.1-setup.patch b/dev-python/bokeh/files/bokeh-0.7.1-setup.patch |
263 |
deleted file mode 100644 |
264 |
index 39ea156..00000000 |
265 |
--- a/dev-python/bokeh/files/bokeh-0.7.1-setup.patch |
266 |
+++ /dev/null |
267 |
@@ -1,17 +0,0 @@ |
268 |
-Remove inappropriate check for a previous installation. |
269 |
- |
270 |
-Original patch for bokek 0.5.0 (0.5.0-setup.patch). |
271 |
-Ported for bokeh 0.7.1 by Marius Brehler. |
272 |
- |
273 |
-http://bugs.gentoo.org/527336 |
274 |
- |
275 |
---- setup.py |
276 |
-+++ setup.py.new |
277 |
-@@ -348,7 +348,6 @@ path = abspath(dirname(__file__)) |
278 |
- |
279 |
- print() |
280 |
- if 'develop' in sys.argv: |
281 |
-- check_remove_bokeh_install(site_packages) |
282 |
- with open(path_file, "w+") as f: |
283 |
- f.write(path) |
284 |
- print("Installing Bokeh for development:") |