1 |
commit: 98897d61dd36cf85381d4692c9eeeff3977aa58b |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 25 06:55:50 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 25 08:41:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98897d61 |
7 |
|
8 |
dev-python/h5py: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/h5py/Manifest | 2 - |
13 |
dev-python/h5py/files/h5py-2.10.0-tests.patch | 32 ---------- |
14 |
dev-python/h5py/files/h5py-3.2.1-i686-types.patch | 55 ----------------- |
15 |
dev-python/h5py/h5py-2.10.0-r1.ebuild | 70 ---------------------- |
16 |
dev-python/h5py/h5py-3.2.1.ebuild | 72 ----------------------- |
17 |
5 files changed, 231 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest |
20 |
index 6a82160a728..e7df49824b7 100644 |
21 |
--- a/dev-python/h5py/Manifest |
22 |
+++ b/dev-python/h5py/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d |
25 |
-DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284 |
26 |
DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae |
27 |
|
28 |
diff --git a/dev-python/h5py/files/h5py-2.10.0-tests.patch b/dev-python/h5py/files/h5py-2.10.0-tests.patch |
29 |
deleted file mode 100644 |
30 |
index 9f810ed46f0..00000000000 |
31 |
--- a/dev-python/h5py/files/h5py-2.10.0-tests.patch |
32 |
+++ /dev/null |
33 |
@@ -1,32 +0,0 @@ |
34 |
-These tests fail as confirmed by upstream. |
35 |
- |
36 |
-Reference: https://github.com/h5py/h5py/issues/1291 |
37 |
-Reference: https://github.com/gentoo/gentoo/pull/14343 |
38 |
- |
39 |
-diff --git a/h5py/tests/test_file2.py b/h5py/tests/test_file2.py |
40 |
-index 0fbf2d5..a7a28bb 100644 |
41 |
---- a/h5py/tests/test_file2.py |
42 |
-+++ b/h5py/tests/test_file2.py |
43 |
-@@ -207,22 +207,6 @@ class TestFileObj(TestCase): |
44 |
- f.create_dataset('test', data=list(range(12))) |
45 |
- self.assertRaises(Exception, list, f['test']) |
46 |
- |
47 |
-- def test_exception_write(self): |
48 |
-- |
49 |
-- class BrokenBytesIO(io.BytesIO): |
50 |
-- def write(self, b): |
51 |
-- raise Exception('I am broken') |
52 |
-- |
53 |
-- f = h5py.File(BrokenBytesIO(), 'w') |
54 |
-- self.assertRaises(Exception, f.create_dataset, 'test', |
55 |
-- data=list(range(12))) |
56 |
-- self.assertRaises(Exception, f.close) |
57 |
-- |
58 |
-- def test_exception_close(self): |
59 |
-- fileobj = io.BytesIO() |
60 |
-- f = h5py.File(fileobj, 'w') |
61 |
-- fileobj.close() |
62 |
-- self.assertRaises(Exception, f.close) |
63 |
- |
64 |
- def test_method_vanish(self): |
65 |
- fileobj = io.BytesIO() |
66 |
|
67 |
diff --git a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch b/dev-python/h5py/files/h5py-3.2.1-i686-types.patch |
68 |
deleted file mode 100644 |
69 |
index 80bbb112e7b..00000000000 |
70 |
--- a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch |
71 |
+++ /dev/null |
72 |
@@ -1,55 +0,0 @@ |
73 |
-From 76c9c8c4049943c490556fa888cf7743d1a677e5 Mon Sep 17 00:00:00 2001 |
74 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
75 |
-Date: Mon, 12 Apr 2021 11:48:16 +0200 |
76 |
-Subject: [PATCH] TST: Skip problematic datatypes based on their length |
77 |
- |
78 |
-Filter datatypes for tests based on their length rather than keeping |
79 |
-a list of illegal platform+type combinations. This is more robust |
80 |
-than the previous solution and fixes the test failures with new numpy |
81 |
-versions (1.19.5 is the oldest I have tested) that declare 'float96' |
82 |
-and 'complex192' on i686 rather than 'float128' and 'complex256'. |
83 |
- |
84 |
-This fixes the following test failure: |
85 |
- |
86 |
- E AttributeError: module 'numpy' has no attribute 'float128' |
87 |
- |
88 |
-plus, later on (again): |
89 |
- |
90 |
- E TypeError: Illegal length 24 for complex dtype |
91 |
---- |
92 |
- h5py/tests/test_dtype.py | 12 +++--------- |
93 |
- 1 file changed, 3 insertions(+), 9 deletions(-) |
94 |
- |
95 |
-diff --git a/h5py/tests/test_dtype.py b/h5py/tests/test_dtype.py |
96 |
-index c5fac97e..ec4eda21 100644 |
97 |
---- a/h5py/tests/test_dtype.py |
98 |
-+++ b/h5py/tests/test_dtype.py |
99 |
-@@ -13,8 +13,6 @@ except ImportError: |
100 |
- |
101 |
- from .common import ut, TestCase |
102 |
- |
103 |
--UNSUPPORTED_LONG_DOUBLE = ('i386', 'i486', 'i586', 'i686', 'ppc64le') |
104 |
-- |
105 |
- |
106 |
- class TestVlen(TestCase): |
107 |
- |
108 |
-@@ -289,13 +287,9 @@ class TestOffsets(TestCase): |
109 |
- if (np.issubdtype(f, np.floating) or |
110 |
- np.issubdtype(f, np.complexfloating))) |
111 |
- |
112 |
-- if platform.machine() in UNSUPPORTED_LONG_DOUBLE: |
113 |
-- dtype_dset_map = {str(j): d |
114 |
-- for j, d in enumerate(dtypes) |
115 |
-- if d not in (np.float128, np.complex256)} |
116 |
-- else: |
117 |
-- dtype_dset_map = {str(j): d |
118 |
-- for j, d in enumerate(dtypes)} |
119 |
-+ dtype_dset_map = {str(j): d |
120 |
-+ for j, d in enumerate(dtypes) |
121 |
-+ if d().nbytes in [4, 8, 16, 32]} |
122 |
- |
123 |
- fname = self.mktemp() |
124 |
- |
125 |
--- |
126 |
-2.31.1 |
127 |
- |
128 |
|
129 |
diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild |
130 |
deleted file mode 100644 |
131 |
index 1a732839476..00000000000 |
132 |
--- a/dev-python/h5py/h5py-2.10.0-r1.ebuild |
133 |
+++ /dev/null |
134 |
@@ -1,70 +0,0 @@ |
135 |
-# Copyright 1999-2020 Gentoo Authors |
136 |
-# Distributed under the terms of the GNU General Public License v2 |
137 |
- |
138 |
-EAPI=7 |
139 |
- |
140 |
-PYTHON_COMPAT=( python3_{7..9} ) |
141 |
- |
142 |
-inherit distutils-r1 flag-o-matic |
143 |
- |
144 |
-DESCRIPTION="Simple Python interface to HDF5 files" |
145 |
-HOMEPAGE="https://www.h5py.org" |
146 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
147 |
- |
148 |
-LICENSE="BSD" |
149 |
-SLOT="0" |
150 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
151 |
-# disable mpi until mpi4py gets python3_8 |
152 |
-#IUSE="examples mpi" |
153 |
-IUSE="examples" |
154 |
- |
155 |
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)] |
156 |
-RDEPEND=" |
157 |
- sci-libs/hdf5:=[hl(+)] |
158 |
- dev-python/numpy[${PYTHON_USEDEP}] |
159 |
- dev-python/six[${PYTHON_USEDEP}]" |
160 |
- |
161 |
-BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]" |
162 |
-# mpi? ( virtual/mpi ) |
163 |
- |
164 |
-DEPEND=" |
165 |
- ${RDEPEND} |
166 |
- dev-python/cython[${PYTHON_USEDEP}] |
167 |
- doc? ( dev-python/alabaster[${PYTHON_USEDEP}] ) |
168 |
- test? ( |
169 |
- dev-python/QtPy[testlib,${PYTHON_USEDEP}] |
170 |
- dev-python/cached-property[${PYTHON_USEDEP}] |
171 |
- )" |
172 |
-# mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
173 |
- |
174 |
-PATCHES=( "${FILESDIR}"/${P}-tests.patch ) |
175 |
-DOCS=( README.rst AUTHORS ANN.rst ) |
176 |
- |
177 |
-distutils_enable_tests setup.py |
178 |
-distutils_enable_sphinx docs --no-autodoc |
179 |
- |
180 |
-#pkg_setup() { |
181 |
-# use mpi && export CC=mpicc |
182 |
-#} |
183 |
- |
184 |
-python_prepare_all() { |
185 |
- append-cflags -fno-strict-aliasing |
186 |
- distutils-r1_python_prepare_all |
187 |
-} |
188 |
- |
189 |
-python_configure() { |
190 |
-# esetup.py configure $(usex mpi --mpi '') |
191 |
- esetup.py configure |
192 |
-} |
193 |
- |
194 |
-python_test() { |
195 |
- esetup.py test || die "Tests fail with ${EPYTHON}" |
196 |
- # tests generate .pytest_cache which should not be installed |
197 |
- rm -r "${BUILD_DIR}/lib/.pytest_cache" || die |
198 |
-} |
199 |
- |
200 |
-python_install_all() { |
201 |
- use examples && dodoc -r examples |
202 |
- |
203 |
- distutils-r1_python_install_all |
204 |
-} |
205 |
|
206 |
diff --git a/dev-python/h5py/h5py-3.2.1.ebuild b/dev-python/h5py/h5py-3.2.1.ebuild |
207 |
deleted file mode 100644 |
208 |
index a658b288acf..00000000000 |
209 |
--- a/dev-python/h5py/h5py-3.2.1.ebuild |
210 |
+++ /dev/null |
211 |
@@ -1,72 +0,0 @@ |
212 |
-# Copyright 1999-2021 Gentoo Authors |
213 |
-# Distributed under the terms of the GNU General Public License v2 |
214 |
- |
215 |
-EAPI=7 |
216 |
- |
217 |
-PYTHON_COMPAT=( python3_{7..10} ) |
218 |
- |
219 |
-inherit distutils-r1 flag-o-matic |
220 |
- |
221 |
-DESCRIPTION="Simple Python interface to HDF5 files" |
222 |
-HOMEPAGE="https://www.h5py.org" |
223 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
224 |
- |
225 |
-LICENSE="BSD" |
226 |
-SLOT="0" |
227 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
228 |
-# disable mpi until mpi4py gets python3_8 |
229 |
-#IUSE="examples mpi" |
230 |
-IUSE="examples" |
231 |
- |
232 |
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)] |
233 |
-DEPEND="sci-libs/hdf5:=[hl(+)]" |
234 |
-RDEPEND="${DEPEND} |
235 |
- $(python_gen_cond_dep ' |
236 |
- dev-python/cached-property[${PYTHON_USEDEP}] |
237 |
- ' python3_7) |
238 |
- dev-python/numpy[${PYTHON_USEDEP}]" |
239 |
- |
240 |
-BDEPEND=" |
241 |
- dev-python/cython[${PYTHON_USEDEP}] |
242 |
- dev-python/numpy[${PYTHON_USEDEP}] |
243 |
- dev-python/pkgconfig[${PYTHON_USEDEP}] |
244 |
- test? ( |
245 |
- dev-python/QtPy[testlib,${PYTHON_USEDEP}] |
246 |
- dev-python/cached-property[${PYTHON_USEDEP}] |
247 |
- )" |
248 |
-# mpi? ( virtual/mpi ) |
249 |
-# mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
250 |
- |
251 |
-distutils_enable_tests pytest |
252 |
-distutils_enable_sphinx docs \ |
253 |
- dev-python/alabaster |
254 |
- |
255 |
-#pkg_setup() { |
256 |
-# use mpi && export CC=mpicc |
257 |
-#} |
258 |
- |
259 |
-PATCHES=( |
260 |
- "${FILESDIR}"/h5py-3.2.1-i686-types.patch |
261 |
-) |
262 |
- |
263 |
-python_prepare_all() { |
264 |
- # avoid pytest-mpi dep, we do not use mpi anyway |
265 |
- sed -i -e 's:pytest-mpi::' pytest.ini || die |
266 |
- distutils-r1_python_prepare_all |
267 |
- |
268 |
- export H5PY_SETUP_REQUIRES=0 |
269 |
-} |
270 |
- |
271 |
-python_test() { |
272 |
- cd "${BUILD_DIR}/lib" || die |
273 |
- pytest -vv -m "not mpi" || |
274 |
- die "Tests failed with ${EPYTHON}" |
275 |
- # tests generate .pytest_cache which should not be installed |
276 |
- rm -r .pytest_cache || die |
277 |
-} |
278 |
- |
279 |
-python_install_all() { |
280 |
- use examples && dodoc -r examples |
281 |
- |
282 |
- distutils-r1_python_install_all |
283 |
-} |