Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numexpr/files/, dev-python/numexpr/
Date: Sat, 25 Feb 2017 20:42:22
Message-Id: 1488055336.60b0e8eb477ee2ed1d57116d884e95f278bf19f0.jlec@gentoo
1 commit: 60b0e8eb477ee2ed1d57116d884e95f278bf19f0
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 25 20:09:41 2017 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 25 20:42:16 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b0e8eb
7
8 dev-python/numexpr: 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/numexpr/Manifest | 4 --
14 .../numexpr/files/numexpr-2.4.3-testfix.patch | 34 -------------
15 dev-python/numexpr/numexpr-2.4.3.ebuild | 55 ----------------------
16 dev-python/numexpr/numexpr-2.4.4.ebuild | 53 ---------------------
17 dev-python/numexpr/numexpr-2.4.6.ebuild | 53 ---------------------
18 dev-python/numexpr/numexpr-2.5.ebuild | 55 ----------------------
19 6 files changed, 254 deletions(-)
20
21 diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
22 index 87f2ee2ba2..183b02c5fe 100644
23 --- a/dev-python/numexpr/Manifest
24 +++ b/dev-python/numexpr/Manifest
25 @@ -1,5 +1 @@
26 -DIST numexpr-2.4.3.tar.gz 85171 SHA256 3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722 SHA512 b33984072fddd4303980be8533e1348b48ff27de5e150029147e3666ce6bb9e1147dbc45eb0ef22506aebaea6fb366d65ff01221235f9b9935d78ea70ba9aa53 WHIRLPOOL ac5981bac643b825d6ab2fbd6c46b6d73ad62374490e5f05a71fc0b9c4269ab401617da98079e1604b11f454863e64e009a2acc00b7b30499b20eff73efe033f
27 -DIST numexpr-2.4.4.tar.gz 87133 SHA256 dfa2fad1af040e93a8022fbe4437f2183bf80e5f64d466381ad589308a73565b SHA512 abc53f8aafb39e55b6b811c1f08c01eefca23c36fb9d20a82484ef658c8062ffe51d8841d6651f43fb7f8cea6420270623df6ba9f98a95a0f7a09e6ceef91b35 WHIRLPOOL 9ab19609189e866a11c03b0aeaa3b93124d8018d53e8dec641721eff39eb73c969c34c457209d63988361ffadef13a205ba5b71d19ad120e9f44313f42c7cd1b
28 -DIST numexpr-2.4.6.tar.gz 87481 SHA256 052397670dc56d7845ff894cd7d858e4f115491ecd93bcc0eda5cb83990c5da3 SHA512 fb68e0e782fd9e9e3cef9288addc0dfc3b79dbf01f0e72422cda6d5effd0f1629a49f9e5b89dcd16fa904423e0e9c776f3f276b4817e83cc58029c90a8627096 WHIRLPOOL 485eb98636f1ee5e1efbc843b404a23f3495d1b6682de15b67275a9c4082c87a1550d1bb91a19a7942f10f2f137af4a6294aaed95d7fd746f2db45d7319b70ec
29 -DIST numexpr-2.5.tar.gz 88347 SHA256 319cdf4e402177a1c8ed4972cffd09f523446f186d347b7c1974787cdabf0294 SHA512 32cc70a9dd8cec67d014056c98e798bdaef6338365366ebebd60fa5655dda2cdcb5df550c8afe87aa85e0c87ebada6ae695d125d8b605f32c368bde731ff2a6c WHIRLPOOL a48a887b324d9a904083621024fcdd6c5fcaa60577c9d76bf88bb370d844b75c409851e9f4a28aefce2a5a3f0420329c67f3d68e825c2525db1dd6aea2340bb1
30 DIST numexpr-2.6.1.tar.gz 90819 SHA256 db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06 SHA512 07c88b1788ecad2c59260e7a6a15dfc21d486462a8866091d157286e5ce3b5b77f5fdab401fd30e2a5e4880398af53641d557003497c7d3658421bfcff38c31c WHIRLPOOL ef77ff356f79d2171685aa1267a63dfbd89a120300dd970bb9768df611a734483e21f78d4b1b09c4f3a5943cbbb6e9b48f03191bd7738063df076c07b6663a49
31
32 diff --git a/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch b/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch
33 deleted file mode 100644
34 index 3104ddcc3d..0000000000
35 --- a/dev-python/numexpr/files/numexpr-2.4.3-testfix.patch
36 +++ /dev/null
37 @@ -1,34 +0,0 @@
38 -https://github.com/avalentino/numexpr/commit/0c2ef2ed05185211d2dd90a193c26f1805c30ad4
39 -diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
40 -index 44761c3..e7e109f 100644
41 ---- a/numexpr/tests/test_numexpr.py
42 -+++ b/numexpr/tests/test_numexpr.py
43 -@@ -721,19 +721,19 @@ def test_add_string_array(self):
44 - self.assert_missing_op('add_sss', expr, locals())
45 -
46 - def test_empty_string1(self):
47 -- a = np.array(["", "pepe"])
48 -- b = np.array(["pepe2", ""])
49 -- res = evaluate("(a == '') & (b == 'pepe2')")
50 -+ a = np.array([b"", b"pepe"])
51 -+ b = np.array([b"pepe2", b""])
52 -+ res = evaluate("(a == b'') & (b == b'pepe2')")
53 - assert_array_equal(res, np.array([True, False]))
54 -- res2 = evaluate("(a == 'pepe') & (b == '')")
55 -+ res2 = evaluate("(a == b'pepe') & (b == b'')")
56 - assert_array_equal(res2, np.array([False, True]))
57 -
58 - def test_empty_string2(self):
59 -- a = np.array(["p", "pepe"])
60 -- b = np.array(["pepe2", ""])
61 -- res = evaluate("(a == '') & (b == 'pepe2')")
62 -+ a = np.array([b"p", b"pepe"])
63 -+ b = np.array([b"pepe2", b""])
64 -+ res = evaluate("(a == b'') & (b == b'pepe2')")
65 - assert_array_equal(res, np.array([False, False]))
66 -- res2 = evaluate("(a == 'pepe') & (b == '')")
67 -+ res2 = evaluate("(a == b'pepe') & (b == b'')")
68 - assert_array_equal(res, np.array([False, False]))
69 -
70 - def test_add_numeric_array(self):
71 -
72
73 diff --git a/dev-python/numexpr/numexpr-2.4.3.ebuild b/dev-python/numexpr/numexpr-2.4.3.ebuild
74 deleted file mode 100644
75 index a69f39208f..0000000000
76 --- a/dev-python/numexpr/numexpr-2.4.3.ebuild
77 +++ /dev/null
78 @@ -1,55 +0,0 @@
79 -# Copyright 1999-2015 Gentoo Foundation
80 -# Distributed under the terms of the GNU General Public License v2
81 -# $Id$
82 -
83 -EAPI=5
84 -
85 -PYTHON_COMPAT=( python{2_7,3_4} )
86 -PYTHON_REQ_USE="threads(+)"
87 -
88 -inherit distutils-r1
89 -
90 -DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
91 -HOMEPAGE="https://github.com/pydata/numexpr"
92 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
93 -
94 -LICENSE="MIT"
95 -SLOT="0"
96 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
97 -IUSE="mkl"
98 -
99 -RDEPEND="
100 - >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
101 - mkl? ( sci-libs/mkl )"
102 -DEPEND="${RDEPEND}
103 - dev-python/setuptools[${PYTHON_USEDEP}]"
104 -
105 -PATCHES=( "${FILESDIR}"/${P}-testfix.patch )
106 -
107 -python_prepare_all() {
108 - # TODO: mkl can be used but it fails for me
109 - # only works with mkl in tree. newer mkl will use pkgconfig
110 - if use mkl; then
111 - local ext
112 - use amd64 && ext=_lp64
113 - cat <<- EOF > "${S}"/site.cfg
114 - [mkl]
115 - library_dirs = ${MKLROOT}/lib/em64t
116 - include_dirs = ${MKLROOT}/include
117 - mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
118 - mkl_intel_thread, mkl_core, iomp5
119 - EOF
120 - fi
121 - distutils-r1_python_prepare_all
122 -}
123 -
124 -python_compile() {
125 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
126 - distutils-r1_python_compile
127 -}
128 -
129 -python_test() {
130 - pushd "${BUILD_DIR}"/lib > /dev/null
131 - "${PYTHON}" -c "import numexpr; numexpr.test()" || die
132 - pushd > /dev/null
133 -}
134
135 diff --git a/dev-python/numexpr/numexpr-2.4.4.ebuild b/dev-python/numexpr/numexpr-2.4.4.ebuild
136 deleted file mode 100644
137 index a52459409b..0000000000
138 --- a/dev-python/numexpr/numexpr-2.4.4.ebuild
139 +++ /dev/null
140 @@ -1,53 +0,0 @@
141 -# Copyright 1999-2015 Gentoo Foundation
142 -# Distributed under the terms of the GNU General Public License v2
143 -# $Id$
144 -
145 -EAPI=5
146 -
147 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
148 -PYTHON_REQ_USE="threads(+)"
149 -
150 -inherit distutils-r1
151 -
152 -DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
153 -HOMEPAGE="https://github.com/pydata/numexpr"
154 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
155 -
156 -LICENSE="MIT"
157 -SLOT="0"
158 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
159 -IUSE="mkl"
160 -
161 -RDEPEND="
162 - >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
163 - mkl? ( sci-libs/mkl )"
164 -DEPEND="${RDEPEND}
165 - dev-python/setuptools[${PYTHON_USEDEP}]"
166 -
167 -python_prepare_all() {
168 - # TODO: mkl can be used but it fails for me
169 - # only works with mkl in tree. newer mkl will use pkgconfig
170 - if use mkl; then
171 - local ext
172 - use amd64 && ext=_lp64
173 - cat <<- EOF > "${S}"/site.cfg
174 - [mkl]
175 - library_dirs = ${MKLROOT}/lib/em64t
176 - include_dirs = ${MKLROOT}/include
177 - mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
178 - mkl_intel_thread, mkl_core, iomp5
179 - EOF
180 - fi
181 - distutils-r1_python_prepare_all
182 -}
183 -
184 -python_compile() {
185 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
186 - distutils-r1_python_compile
187 -}
188 -
189 -python_test() {
190 - pushd "${BUILD_DIR}"/lib > /dev/null
191 - "${PYTHON}" -c "import numexpr; numexpr.test()" || die
192 - pushd > /dev/null
193 -}
194
195 diff --git a/dev-python/numexpr/numexpr-2.4.6.ebuild b/dev-python/numexpr/numexpr-2.4.6.ebuild
196 deleted file mode 100644
197 index a52459409b..0000000000
198 --- a/dev-python/numexpr/numexpr-2.4.6.ebuild
199 +++ /dev/null
200 @@ -1,53 +0,0 @@
201 -# Copyright 1999-2015 Gentoo Foundation
202 -# Distributed under the terms of the GNU General Public License v2
203 -# $Id$
204 -
205 -EAPI=5
206 -
207 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
208 -PYTHON_REQ_USE="threads(+)"
209 -
210 -inherit distutils-r1
211 -
212 -DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
213 -HOMEPAGE="https://github.com/pydata/numexpr"
214 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
215 -
216 -LICENSE="MIT"
217 -SLOT="0"
218 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
219 -IUSE="mkl"
220 -
221 -RDEPEND="
222 - >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
223 - mkl? ( sci-libs/mkl )"
224 -DEPEND="${RDEPEND}
225 - dev-python/setuptools[${PYTHON_USEDEP}]"
226 -
227 -python_prepare_all() {
228 - # TODO: mkl can be used but it fails for me
229 - # only works with mkl in tree. newer mkl will use pkgconfig
230 - if use mkl; then
231 - local ext
232 - use amd64 && ext=_lp64
233 - cat <<- EOF > "${S}"/site.cfg
234 - [mkl]
235 - library_dirs = ${MKLROOT}/lib/em64t
236 - include_dirs = ${MKLROOT}/include
237 - mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
238 - mkl_intel_thread, mkl_core, iomp5
239 - EOF
240 - fi
241 - distutils-r1_python_prepare_all
242 -}
243 -
244 -python_compile() {
245 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
246 - distutils-r1_python_compile
247 -}
248 -
249 -python_test() {
250 - pushd "${BUILD_DIR}"/lib > /dev/null
251 - "${PYTHON}" -c "import numexpr; numexpr.test()" || die
252 - pushd > /dev/null
253 -}
254
255 diff --git a/dev-python/numexpr/numexpr-2.5.ebuild b/dev-python/numexpr/numexpr-2.5.ebuild
256 deleted file mode 100644
257 index a1cb99022c..0000000000
258 --- a/dev-python/numexpr/numexpr-2.5.ebuild
259 +++ /dev/null
260 @@ -1,55 +0,0 @@
261 -# Copyright 1999-2016 Gentoo Foundation
262 -# Distributed under the terms of the GNU General Public License v2
263 -# $Id$
264 -
265 -EAPI=6
266 -
267 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
268 -PYTHON_REQ_USE="threads(+)"
269 -
270 -inherit distutils-r1
271 -
272 -DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
273 -HOMEPAGE="https://github.com/pydata/numexpr"
274 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
275 -
276 -LICENSE="MIT"
277 -SLOT="0"
278 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
279 -IUSE="mkl"
280 -
281 -RDEPEND="
282 - >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
283 - mkl? ( sci-libs/mkl )"
284 -DEPEND="${RDEPEND}
285 - dev-python/setuptools[${PYTHON_USEDEP}]"
286 -
287 -python_prepare_all() {
288 - # TODO: mkl can be used but it fails for me
289 - # only works with mkl in tree. newer mkl will use pkgconfig
290 - if use mkl; then
291 - local ext
292 - use amd64 && ext=_lp64
293 - cat <<- EOF > "${S}"/site.cfg
294 - [mkl]
295 - library_dirs = ${MKLROOT}/lib/em64t
296 - include_dirs = ${MKLROOT}/include
297 - mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
298 - mkl_intel_thread, mkl_core, iomp5
299 - EOF
300 - fi
301 - distutils-r1_python_prepare_all
302 -}
303 -
304 -python_compile() {
305 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
306 - distutils-r1_python_compile
307 -}
308 -
309 -python_test() {
310 - pushd "${BUILD_DIR}"/lib > /dev/null
311 - "${PYTHON}" \
312 - -c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
313 - || die
314 - pushd > /dev/null
315 -}