Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-python/bokeh/files/, dev-python/bokeh/
Date: Mon, 07 Jul 2014 06:55:37
Message-Id: 1404716120.8f32d4a6e9993aad1c3c1febbb1dd471c2acf199.jlec@gentoo
1 commit: 8f32d4a6e9993aad1c3c1febbb1dd471c2acf199
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 7 06:55:20 2014 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 7 06:55:20 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8f32d4a6
7
8 InCvs
9
10 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12 ---
13 dev-python/bokeh/ChangeLog | 11 ---
14 dev-python/bokeh/bokeh-0.4.4.ebuild | 98 ----------------------
15 .../bokeh/files/bokeh-0.4.4-fix_test_object.patch | 32 -------
16 dev-python/bokeh/metadata.xml | 15 ----
17 4 files changed, 156 deletions(-)
18
19 diff --git a/dev-python/bokeh/ChangeLog b/dev-python/bokeh/ChangeLog
20 deleted file mode 100644
21 index 0dac602..0000000
22 --- a/dev-python/bokeh/ChangeLog
23 +++ /dev/null
24 @@ -1,11 +0,0 @@
25 -# ChangeLog for dev-python/bokeh
26 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: $
28 -
29 -*bokeh-0.4.4 (07 Jul 2014)
30 -
31 - 07 Jul 2014; Witold Pilat (fau) <witold.pilat@×××××.com> +bokeh-0.4.4.ebuild,
32 - +files/bokeh-0.4.4-fix_test_object.patch, -ChangeLog, -Manifest,
33 - -bokeh-0.4.2.ebuild, metadata.xml:
34 - dev-python/bokeh: dev-python/bokeh: New version with python3 support for bug
35 - #516052
36
37 diff --git a/dev-python/bokeh/bokeh-0.4.4.ebuild b/dev-python/bokeh/bokeh-0.4.4.ebuild
38 deleted file mode 100644
39 index 22d38c5..0000000
40 --- a/dev-python/bokeh/bokeh-0.4.4.ebuild
41 +++ /dev/null
42 @@ -1,98 +0,0 @@
43 -# Copyright 1999-2014 Gentoo Foundation
44 -# Distributed under the terms of the GNU General Public License v2
45 -# $Header: $
46 -
47 -EAPI=5
48 -
49 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
50 -
51 -inherit distutils-r1
52 -
53 -DESCRIPTION="Statistical and interactive HTML plots for Python"
54 -HOMEPAGE="http://bokeh.pydata.org/"
55 -SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
56 -
57 -SLOT="0"
58 -LICENSE="BSD"
59 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
60 -IUSE="examples test chaco"
61 -# docs require napoleon sphinx extension which will be included in next sphinx release
62 -
63 -RDEPEND="
64 - >=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
65 - >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
66 - >=dev-python/itsdangerous-0.23[${PYTHON_USEDEP}]
67 - >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
68 - >=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
69 - >=dev-python/markupsafe-0.18[${PYTHON_USEDEP}]
70 - >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
71 - >=dev-python/pandas-0.11[${PYTHON_USEDEP}]
72 - >=dev-python/pygments-1.6[${PYTHON_USEDEP}]
73 - >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
74 - >=dev-python/pystache-0.5.3[${PYTHON_USEDEP}]
75 - >=dev-python/pytz-2013b[${PYTHON_USEDEP}]
76 - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
77 - >=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
78 - >=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
79 - >=dev-python/six-1.5.2[${PYTHON_USEDEP}]
80 - >=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
81 - $(python_gen_cond_dep '>=dev-python/gevent-1.0[${PYTHON_USEDEP}]' python2_7)
82 - $(python_gen_cond_dep '>=dev-python/gevent-websocket-0.9.2[${PYTHON_USEDEP}]' python2_7)
83 - chaco? (
84 - $(python_gen_cond_dep '>=dev-python/traits-4.4[${PYTHON_USEDEP}]' python2_7)
85 - $(python_gen_cond_dep '>=dev-python/chaco-4.4[${PYTHON_USEDEP}]' python2_7)
86 - )
87 -
88 -"
89 -# testing server: needs websocket not in portage yet
90 -# >=dev-python/websocket[${PYTHON_USEDEP}]
91 -# hdf5 backend: needs arraymanagement not in portage yet
92 -DEPEND="
93 - test? (
94 - ${RDEPEND}
95 - >=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
96 - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
97 - >=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
98 - )
99 -"
100 -DOCS=( CHANGELOG QUICKSTART.md README.md )
101 -
102 -python_prepare_all() {
103 - # Fix test_references_by_ref_by_value from test_object.py
104 - local PATCHES=( "${FILESDIR}"/${P}-fix_test_object.patch )
105 - # Remove broken test case
106 - sed -i -e "s:MetaTest:_&:" bokeh/tests/test_bokeh_init.py || die
107 -
108 - if ! use chaco; then
109 - sed -i -e "/'bokeh.chaco_gg'/d" setup.py || die
110 - fi
111 -
112 - distutils-r1_python_prepare_all
113 -}
114 -
115 -python_install_all() {
116 - use examples && local EXAMPLES=( examples/. )
117 -
118 - distutils-r1_python_install_all
119 -}
120 -
121 -python_test() {
122 - cd "${BUILD_DIR}"/lib || die
123 - # exclude server tests for now
124 - nosetests -v \
125 - -e multiuser_auth_test \
126 - -e usermodel_test \
127 - || die
128 -}
129 -
130 -pkg_postinst() {
131 - elog "websockets work only with python2_7"
132 - local chaco_msg="chaco useflag doesn't affect python targets other than python2_7"
133 - if use chaco; then
134 - if use python_targets_python2_7; then
135 - elog "${chaco_msg}"
136 - else
137 - ewarn "${chaco_msg}"
138 - fi
139 - fi
140 -}
141
142 diff --git a/dev-python/bokeh/files/bokeh-0.4.4-fix_test_object.patch b/dev-python/bokeh/files/bokeh-0.4.4-fix_test_object.patch
143 deleted file mode 100644
144 index 24183d8..0000000
145 --- a/dev-python/bokeh/files/bokeh-0.4.4-fix_test_object.patch
146 +++ /dev/null
147 @@ -1,32 +0,0 @@
148 -commit 9606ae037dbd9ee888f9763a1bd9c6d7fc3b5824
149 -Author: Bryan Van de Ven <bryanv@×××××××××.io>
150 -Date: Sat Apr 19 10:05:35 2014 -0500
151 -
152 - fix #548
153 -
154 -diff --git a/bokeh/plotobject.py b/bokeh/plotobject.py
155 -index 7485d27..92ae2dd 100644
156 ---- a/bokeh/plotobject.py
157 -+++ b/bokeh/plotobject.py
158 -@@ -220,7 +220,7 @@ class PlotObject(HasProps):
159 -
160 - def references(self):
161 - """Returns all ``PlotObjects`` that this object has references to. """
162 -- return self.collect_plot_objects(self)
163 -+ return set(self.collect_plot_objects(self))
164 -
165 - #---------------------------------------------------------------------
166 - # View Model connection methods
167 -diff --git a/bokeh/tests/test_objects.py b/bokeh/tests/test_objects.py
168 -index 1a17f69..75d5678 100644
169 ---- a/bokeh/tests/test_objects.py
170 -+++ b/bokeh/tests/test_objects.py
171 -@@ -242,7 +242,7 @@ class TestPlotObject(unittest.TestCase):
172 - x2 = X2(y=y, z2=z2)
173 -
174 - # TODO: self.assertEqual(x1.references(), [t1, y, t2, x1])
175 -- self.assertEqual(x2.references(), [t1, y, t2, z2, x2])
176 -+ self.assertEqual(x2.references(), set([t1, y, t2, z2, x2]))
177 -
178 - if __name__ == "__main__":
179 - unittest.main()
180
181 diff --git a/dev-python/bokeh/metadata.xml b/dev-python/bokeh/metadata.xml
182 deleted file mode 100644
183 index b59e358..0000000
184 --- a/dev-python/bokeh/metadata.xml
185 +++ /dev/null
186 @@ -1,15 +0,0 @@
187 -<?xml version="1.0" encoding="UTF-8"?>
188 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
189 -<pkgmetadata>
190 -<herd>sci</herd>
191 -<longdescription lang="en">
192 - Bokeh is a Python interactive visualization library for large
193 - datasets that natively uses the latest web technologies. Its goal is
194 - to provide elegant, concise construction of novel graphics in the
195 - style of Protovis/D3, while delivering high-performance
196 - interactivity over large data to thin clients.
197 -</longdescription>
198 -<use>
199 - <flag name="chaco">Enable interface for implementing qplot and ggplot like functionality using chaco</flag>
200 -</use>
201 -</pkgmetadata>