1 |
commit: 6ada0d6fa619b68b826130574ab9aafc71eaf5c2 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 3 07:51:54 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 3 08:27:48 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ada0d6f |
7 |
|
8 |
dev-python/pytables: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pytables/Manifest | 1 - |
13 |
...tables-3.6.1-big-endian-tests-skip-subset.patch | 36 ----- |
14 |
.../files/pytables-3.6.1-numpy-float.patch | 176 --------------------- |
15 |
.../pytables/files/pytables-3.6.1-py310.patch | 49 ------ |
16 |
dev-python/pytables/pytables-3.6.1-r2.ebuild | 89 ----------- |
17 |
5 files changed, 351 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest |
20 |
index 0ef697796364..c456f554b2d0 100644 |
21 |
--- a/dev-python/pytables/Manifest |
22 |
+++ b/dev-python/pytables/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST tables-3.6.1.tar.gz 4641089 BLAKE2B 4ef44b1263f40babe6719bac911ab191e9cb0c58c377705b755fa83f1fba5af1d0fab10b0b45bd6af619a9dce4842a80afad8d8fbab64c3be4f35a1b3f117ee3 SHA512 7f018b70251095049bce9075be4e19f72efba9d39121a35c4521f634b1dd5b81ab6de47df3bb44ad6b8b2dbdbff4e6d0985ad1a7b2f13b44f920c0935e5830ff |
25 |
DIST tables-3.7.0.tar.gz 8227955 BLAKE2B 0d5b7b765375c4787f1210138e5fd02e3c0ce429ef209a3a8d4fd3bc094f68486ab6f4d0a960ce86efea6991ed691ef2a3e9e8f37a49fe91cb8d6372cadea80e SHA512 eaa368d063b5fad87e6d0f9ab6f02da0b2a3542740a52fe8c2bb58e41121495d07b6d2710ad402a28891294aa61a11238c6a7e2cf2933a1bb11391b79cf4fd13 |
26 |
|
27 |
diff --git a/dev-python/pytables/files/pytables-3.6.1-big-endian-tests-skip-subset.patch b/dev-python/pytables/files/pytables-3.6.1-big-endian-tests-skip-subset.patch |
28 |
deleted file mode 100644 |
29 |
index 6a492a1a581f..000000000000 |
30 |
--- a/dev-python/pytables/files/pytables-3.6.1-big-endian-tests-skip-subset.patch |
31 |
+++ /dev/null |
32 |
@@ -1,36 +0,0 @@ |
33 |
-https://bugs.gentoo.org/805995 |
34 |
-https://github.com/PyTables/PyTables/issues/735 |
35 |
-https://sources.debian.org/src/pytables/3.6.1-5/debian/patches/0005-Skip-index-backcompat-tests-on-bingendian.patch/ |
36 |
- |
37 |
-From: Antonio Valentino <antonio.valentino@×××××××.it> |
38 |
-Date: Sat, 3 Aug 2019 16:22:13 +0000 |
39 |
-Subject: Skip index backcompat tests on bingendian |
40 |
- |
41 |
-Forwarded: not-needed |
42 |
---- a/tables/tests/test_index_backcompat.py |
43 |
-+++ b/tables/tests/test_index_backcompat.py |
44 |
-@@ -6,8 +6,10 @@ from tables.tests.common import verbose |
45 |
- from tables.tests.common import unittest, test_filename |
46 |
- from tables.tests.common import PyTablesTestCase as TestCase |
47 |
- |
48 |
-+import sys |
49 |
- |
50 |
- # Check indexes from PyTables version 2.0 |
51 |
-+@××××××××.skipIf(sys.byteorder != 'little', 'broken on big-endian') |
52 |
- class IndexesTestCase(common.TestFileMixin, TestCase): |
53 |
- |
54 |
- def setUp(self): |
55 |
-@@ -145,11 +147,13 @@ class IndexesTestCase(common.TestFileMixin, TestCase): |
56 |
- |
57 |
- |
58 |
- # Check indexes from PyTables version 2.0 |
59 |
-+@××××××××.skipIf(sys.byteorder != 'little', 'broken on big-endian') |
60 |
- class Indexes2_0TestCase(IndexesTestCase): |
61 |
- h5fname = test_filename("indexes_2_0.h5") |
62 |
- |
63 |
- |
64 |
- # Check indexes from PyTables version 2.1 |
65 |
-+@××××××××.skipIf(sys.byteorder != 'little', 'broken on big-endian') |
66 |
- class Indexes2_1TestCase(IndexesTestCase): |
67 |
- h5fname = test_filename("indexes_2_1.h5") |
68 |
- |
69 |
|
70 |
diff --git a/dev-python/pytables/files/pytables-3.6.1-numpy-float.patch b/dev-python/pytables/files/pytables-3.6.1-numpy-float.patch |
71 |
deleted file mode 100644 |
72 |
index 71fa3b85dacf..000000000000 |
73 |
--- a/dev-python/pytables/files/pytables-3.6.1-numpy-float.patch |
74 |
+++ /dev/null |
75 |
@@ -1,176 +0,0 @@ |
76 |
-From d2a480d14f29fb1d2baee292bc6a2cca4817dcbd Mon Sep 17 00:00:00 2001 |
77 |
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl> |
78 |
-Date: Sun, 24 Jan 2021 16:36:21 +0100 |
79 |
-Subject: [PATCH] Use lowercase float/int as numpy dtype |
80 |
- |
81 |
-Float64 is gone with numpy 1.20, which causes doctests to fail |
82 |
-(https://bugzilla.redhat.com/show_bug.cgi?id=1914335). |
83 |
- |
84 |
-Similarly all uses of Float32, Int32 should be replaced by float32 and int32. |
85 |
- |
86 |
->>> numpy.__version__ |
87 |
-'1.19.4' |
88 |
->>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')] |
89 |
-['float16', 'Float16', 'float32', 'Float32', 'float64', 'Float64', 'float128', 'Float128', 'float_', 'float'] |
90 |
- |
91 |
->>> numpy.__version__ |
92 |
-'1.20.0rc2' |
93 |
->>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')] |
94 |
-['float16', 'float32', 'float64', 'float128', 'float_', 'float'] |
95 |
---- |
96 |
- bench/bsddb-table-bench.py | 10 +++++----- |
97 |
- bench/postgres-search-bench.py | 4 ++-- |
98 |
- bench/pytables-search-bench.py | 6 +++--- |
99 |
- bench/recarray2-test.py | 2 +- |
100 |
- bench/shelve-bench.py | 10 +++++----- |
101 |
- bench/sqlite-search-bench.py | 4 ++-- |
102 |
- tables/atom.py | 2 +- |
103 |
- 7 files changed, 19 insertions(+), 19 deletions(-) |
104 |
- |
105 |
-diff --git a/bench/bsddb-table-bench.py b/bench/bsddb-table-bench.py |
106 |
-index dd9f875b..a2e02361 100644 |
107 |
---- a/bench/bsddb-table-bench.py |
108 |
-+++ b/bench/bsddb-table-bench.py |
109 |
-@@ -83,11 +83,11 @@ def createFile(filename, totalrows, recsize, verbose): |
110 |
- # Get the record object associated with the new table |
111 |
- if recsize == "big": |
112 |
- isrec = Big() |
113 |
-- arr = np.array(np.arange(32), type=np.Float64) |
114 |
-- arr2 = np.array(np.arange(32), type=np.Float64) |
115 |
-+ arr = np.array(np.arange(32), type=np.float64) |
116 |
-+ arr2 = np.array(np.arange(32), type=np.float64) |
117 |
- elif recsize == "medium": |
118 |
- isrec = Medium() |
119 |
-- arr = np.array(np.arange(2), type=np.Float64) |
120 |
-+ arr = np.array(np.arange(2), type=np.float64) |
121 |
- else: |
122 |
- isrec = Small() |
123 |
- # print d |
124 |
-@@ -107,8 +107,8 @@ def createFile(filename, totalrows, recsize, verbose): |
125 |
- #d['TDCcount'] = i % 256 |
126 |
- d['ADCcount'] = (i * 256) % (1 << 16) |
127 |
- if recsize == "big": |
128 |
-- #d.float1 = np.array([i]*32, np.Float64) |
129 |
-- #d.float2 = np.array([i**2]*32, np.Float64) |
130 |
-+ #d.float1 = np.array([i]*32, np.float64) |
131 |
-+ #d.float2 = np.array([i**2]*32, np.float64) |
132 |
- arr[0] = 1.1 |
133 |
- d['float1'] = arr |
134 |
- arr2[0] = 2.2 |
135 |
-diff --git a/bench/postgres-search-bench.py b/bench/postgres-search-bench.py |
136 |
-index d2c9f4f4..7fe83f6a 100644 |
137 |
---- a/bench/postgres-search-bench.py |
138 |
-+++ b/bench/postgres-search-bench.py |
139 |
-@@ -15,11 +15,11 @@ def flatten(l): |
140 |
- |
141 |
- |
142 |
- def fill_arrays(start, stop): |
143 |
-- col_i = numpy.arange(start, stop, type=numpy.Int32) |
144 |
-+ col_i = numpy.arange(start, stop, type=numpy.int32) |
145 |
- if userandom: |
146 |
- col_j = numpy.random.uniform(0, nrows, size=[stop - start]) |
147 |
- else: |
148 |
-- col_j = numpy.array(col_i, type=numpy.Float64) |
149 |
-+ col_j = numpy.array(col_i, type=numpy.float64) |
150 |
- return col_i, col_j |
151 |
- |
152 |
- # Generator for ensure pytables benchmark compatibility |
153 |
-diff --git a/bench/pytables-search-bench.py b/bench/pytables-search-bench.py |
154 |
-index 726d30b1..6417186b 100644 |
155 |
---- a/bench/pytables-search-bench.py |
156 |
-+++ b/bench/pytables-search-bench.py |
157 |
-@@ -37,11 +37,11 @@ def create_db(filename, nrows): |
158 |
- stop = (j + 1) * step |
159 |
- if stop > nrows: |
160 |
- stop = nrows |
161 |
-- arr_f8 = np.arange(i, stop, type=np.Float64) |
162 |
-- arr_i4 = np.arange(i, stop, type=np.Int32) |
163 |
-+ arr_f8 = np.arange(i, stop, type=np.float64) |
164 |
-+ arr_i4 = np.arange(i, stop, type=np.int32) |
165 |
- if userandom: |
166 |
- arr_f8 += np.random.normal(0, stop * scale, shape=[stop - i]) |
167 |
-- arr_i4 = np.array(arr_f8, type=np.Int32) |
168 |
-+ arr_i4 = np.array(arr_f8, type=np.int32) |
169 |
- recarr = np.rec.fromarrays([arr_i4, arr_i4, arr_f8, arr_f8]) |
170 |
- table.append(recarr) |
171 |
- j += 1 |
172 |
-diff --git a/bench/recarray2-test.py b/bench/recarray2-test.py |
173 |
-index a8602d80..bf55389d 100644 |
174 |
---- a/bench/recarray2-test.py |
175 |
-+++ b/bench/recarray2-test.py |
176 |
-@@ -22,7 +22,7 @@ delta = 0.000001 |
177 |
- # Creation of recarrays objects for test |
178 |
- x1 = np.array(np.arange(reclen)) |
179 |
- x2 = chararray.array(None, itemsize=7, shape=reclen) |
180 |
--x3 = np.array(np.arange(reclen, reclen * 3, 2), np.Float64) |
181 |
-+x3 = np.array(np.arange(reclen, reclen * 3, 2), np.float64) |
182 |
- r1 = recarray.fromarrays([x1, x2, x3], names='a,b,c') |
183 |
- r2 = recarray2.fromarrays([x1, x2, x3], names='a,b,c') |
184 |
- |
185 |
-diff --git a/bench/shelve-bench.py b/bench/shelve-bench.py |
186 |
-index d30739d8..a591ed1e 100644 |
187 |
---- a/bench/shelve-bench.py |
188 |
-+++ b/bench/shelve-bench.py |
189 |
-@@ -65,8 +65,8 @@ def createFile(filename, totalrows, recsize): |
190 |
- # Get the record object associated with the new table |
191 |
- if recsize == "big": |
192 |
- d = Big() |
193 |
-- arr = NA.array(NA.arange(32), type=NA.Float64) |
194 |
-- arr2 = NA.array(NA.arange(32), type=NA.Float64) |
195 |
-+ arr = NA.array(NA.arange(32), type=NA.float64) |
196 |
-+ arr2 = NA.array(NA.arange(32), type=NA.float64) |
197 |
- elif recsize == "medium": |
198 |
- d = Medium() |
199 |
- else: |
200 |
-@@ -87,15 +87,15 @@ def createFile(filename, totalrows, recsize): |
201 |
- #d.TDCcount = i % 256 |
202 |
- d.ADCcount = (i * 256) % (1 << 16) |
203 |
- if recsize == "big": |
204 |
-- #d.float1 = NA.array([i]*32, NA.Float64) |
205 |
-- #d.float2 = NA.array([i**2]*32, NA.Float64) |
206 |
-+ #d.float1 = NA.array([i]*32, NA.float64) |
207 |
-+ #d.float2 = NA.array([i**2]*32, NA.float64) |
208 |
- arr[0] = 1.1 |
209 |
- d.float1 = arr |
210 |
- arr2[0] = 2.2 |
211 |
- d.float2 = arr2 |
212 |
- pass |
213 |
- else: |
214 |
-- d.float1 = NA.array([i ** 2] * 2, NA.Float64) |
215 |
-+ d.float1 = NA.array([i ** 2] * 2, NA.float64) |
216 |
- #d.float1 = float(i) |
217 |
- #d.float2 = float(i) |
218 |
- d.grid_i = i |
219 |
-diff --git a/bench/sqlite-search-bench.py b/bench/sqlite-search-bench.py |
220 |
-index 76dc7c57..dc611695 100644 |
221 |
---- a/bench/sqlite-search-bench.py |
222 |
-+++ b/bench/sqlite-search-bench.py |
223 |
-@@ -136,10 +136,10 @@ CREATE INDEX ivar3 ON small(var3); |
224 |
- if randomvalues: |
225 |
- var3 = np.random.uniform(minimum, maximum, shape=[j - i]) |
226 |
- else: |
227 |
-- var3 = np.arange(i, j, type=np.Float64) |
228 |
-+ var3 = np.arange(i, j, type=np.float64) |
229 |
- if noise: |
230 |
- var3 += np.random.uniform(-3, 3, shape=[j - i]) |
231 |
-- var2 = np.array(var3, type=np.Int32) |
232 |
-+ var2 = np.array(var3, type=np.int32) |
233 |
- var1 = np.array(None, shape=[j - i], dtype='s4') |
234 |
- if not heavy: |
235 |
- for n in range(j - i): |
236 |
-diff --git a/tables/atom.py b/tables/atom.py |
237 |
-index f92e16ad..f93d915b 100644 |
238 |
---- a/tables/atom.py |
239 |
-+++ b/tables/atom.py |
240 |
-@@ -338,7 +338,7 @@ class Atom(metaclass=MetaAtom): |
241 |
- Traceback (most recent call last): |
242 |
- ... |
243 |
- ValueError: unknown NumPy scalar type: 'S5' |
244 |
-- >>> Atom.from_sctype('Float64') |
245 |
-+ >>> Atom.from_sctype('float64') |
246 |
- Float64Atom(shape=(), dflt=0.0) |
247 |
- |
248 |
- """ |
249 |
--- |
250 |
-2.32.0 |
251 |
- |
252 |
|
253 |
diff --git a/dev-python/pytables/files/pytables-3.6.1-py310.patch b/dev-python/pytables/files/pytables-3.6.1-py310.patch |
254 |
deleted file mode 100644 |
255 |
index 600516d16396..000000000000 |
256 |
--- a/dev-python/pytables/files/pytables-3.6.1-py310.patch |
257 |
+++ /dev/null |
258 |
@@ -1,49 +0,0 @@ |
259 |
-From 2431150d691f5ccdb3da204a46e346c156ea2523 Mon Sep 17 00:00:00 2001 |
260 |
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl> |
261 |
-Date: Mon, 16 Nov 2020 10:53:05 +0100 |
262 |
-Subject: [PATCH] doctest: adjust __init__ TypeError formatting |
263 |
- |
264 |
-Python3.10 includes the class name in the TypeError string for |
265 |
-__init__(), so the literal match does not work anymore. |
266 |
---- |
267 |
- tables/atom.py | 4 ++-- |
268 |
- tables/filters.py | 4 ++-- |
269 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
270 |
- |
271 |
-diff --git a/tables/atom.py b/tables/atom.py |
272 |
-index 81d37c54..9cfd8609 100644 |
273 |
---- a/tables/atom.py |
274 |
-+++ b/tables/atom.py |
275 |
-@@ -569,10 +569,10 @@ class Atom(metaclass=MetaAtom): |
276 |
- >>> atom3 = atom1.copy(shape=(2, 2)) |
277 |
- >>> print(atom3) |
278 |
- Int32Atom(shape=(2, 2), dflt=0) |
279 |
-- >>> atom1.copy(foobar=42) |
280 |
-+ >>> atom1.copy(foobar=42) #doctest: +ELLIPSIS |
281 |
- Traceback (most recent call last): |
282 |
- ... |
283 |
-- TypeError: __init__() got an unexpected keyword argument 'foobar' |
284 |
-+ TypeError: ...__init__() got an unexpected keyword argument 'foobar' |
285 |
- |
286 |
- """ |
287 |
- newargs = self._get_init_args() |
288 |
-diff --git a/tables/filters.py b/tables/filters.py |
289 |
-index f809ce77..7cb9b02d 100644 |
290 |
---- a/tables/filters.py |
291 |
-+++ b/tables/filters.py |
292 |
-@@ -432,10 +432,10 @@ class Filters: |
293 |
- Filters(complevel=0, shuffle=False, bitshuffle=False, fletcher32=False, least_significant_digit=None) |
294 |
- >>> print(filters3) |
295 |
- Filters(complevel=1, complib='zlib', shuffle=False, bitshuffle=False, fletcher32=False, least_significant_digit=None) |
296 |
-- >>> filters1.copy(foobar=42) |
297 |
-+ >>> filters1.copy(foobar=42) #doctest: +ELLIPSIS |
298 |
- Traceback (most recent call last): |
299 |
- ... |
300 |
-- TypeError: __init__() got an unexpected keyword argument 'foobar' |
301 |
-+ TypeError: ...__init__() got an unexpected keyword argument 'foobar' |
302 |
- |
303 |
- """ |
304 |
- |
305 |
--- |
306 |
-2.32.0 |
307 |
- |
308 |
|
309 |
diff --git a/dev-python/pytables/pytables-3.6.1-r2.ebuild b/dev-python/pytables/pytables-3.6.1-r2.ebuild |
310 |
deleted file mode 100644 |
311 |
index 39b290e8a448..000000000000 |
312 |
--- a/dev-python/pytables/pytables-3.6.1-r2.ebuild |
313 |
+++ /dev/null |
314 |
@@ -1,89 +0,0 @@ |
315 |
-# Copyright 1999-2021 Gentoo Authors |
316 |
-# Distributed under the terms of the GNU General Public License v2 |
317 |
- |
318 |
-EAPI=7 |
319 |
- |
320 |
-PYTHON_COMPAT=( python3_{8..10} ) |
321 |
-PYTHON_REQ_USE="threads(+)" |
322 |
- |
323 |
-MY_PN=tables |
324 |
-MY_P=${MY_PN}-${PV} |
325 |
- |
326 |
-inherit distutils-r1 |
327 |
- |
328 |
-DESCRIPTION="Hierarchical datasets for Python" |
329 |
-HOMEPAGE="https://www.pytables.org/" |
330 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
331 |
-S="${WORKDIR}/${MY_P}" |
332 |
- |
333 |
-LICENSE="BSD" |
334 |
-SLOT="0" |
335 |
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" |
336 |
-IUSE="doc examples test" |
337 |
-RESTRICT="!test? ( test )" |
338 |
- |
339 |
-# See https://github.com/PyTables/PyTables/issues/912 for hdf5 upper bound |
340 |
-DEPEND=" |
341 |
- app-arch/bzip2:0= |
342 |
- app-arch/lz4:0= |
343 |
- >=app-arch/zstd-1.0.0:= |
344 |
- >=dev-libs/c-blosc-1.11.1:0= |
345 |
- dev-libs/lzo:2= |
346 |
- >=dev-python/numpy-1.8.1[${PYTHON_USEDEP}] |
347 |
- <sci-libs/hdf5-1.12:= |
348 |
-" |
349 |
-RDEPEND="${DEPEND} |
350 |
- >=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}] |
351 |
- dev-python/six[${PYTHON_USEDEP}]" |
352 |
-BDEPEND=" |
353 |
- >=dev-python/cython-0.21[${PYTHON_USEDEP}] |
354 |
- virtual/pkgconfig |
355 |
- test? ( |
356 |
- dev-python/mock[${PYTHON_USEDEP}] |
357 |
- ${RDEPEND} |
358 |
- ) |
359 |
-" |
360 |
- |
361 |
-DOCS=( RELEASE_NOTES.txt THANKS ) |
362 |
- |
363 |
-PATCHES=( |
364 |
- "${FILESDIR}"/${P}-numpy-float.patch |
365 |
- "${FILESDIR}"/${P}-py310.patch |
366 |
- "${FILESDIR}"/${PN}-3.6.1-big-endian-tests-skip-subset.patch |
367 |
-) |
368 |
- |
369 |
-python_prepare_all() { |
370 |
- export {BLOSC,BZIP2,LZO,HDF5}_DIR="${ESYSROOT}"/usr |
371 |
- export PYTABLES_NO_EMBEDDED_LIBS=1 |
372 |
- export USE_PKGCONFIG=TRUE |
373 |
- |
374 |
- rm tables/*.c || die |
375 |
- sed -e "s:/usr:${EPREFIX}/usr:g" \ |
376 |
- -i setup.py || die |
377 |
- rm -r c-blosc/{blosc,internal-complibs} || die |
378 |
- sed -i -e '/_version/ s/\\s\*/\\s\+/' setup.py || die |
379 |
- distutils-r1_python_prepare_all |
380 |
-} |
381 |
- |
382 |
-python_compile() { |
383 |
- distutils-r1_python_compile -j1 |
384 |
-} |
385 |
- |
386 |
-python_test() { |
387 |
- cd "${BUILD_DIR}"/lib* || die |
388 |
- "${EPYTHON}" tables/tests/test_all.py -v || die |
389 |
-} |
390 |
- |
391 |
-python_install_all() { |
392 |
- if use doc; then |
393 |
- DOCS+=( doc/scripts ) |
394 |
- fi |
395 |
- distutils-r1_python_install_all |
396 |
- |
397 |
- if use examples; then |
398 |
- dodoc -r examples |
399 |
- dodoc -r contrib |
400 |
- docompress -x /usr/share/doc/${PF}/examples |
401 |
- docompress -x /usr/share/doc/${PF}/contrib |
402 |
- fi |
403 |
-} |