Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/h5py/, dev-python/h5py/files/
Date: Tue, 02 May 2017 09:48:18
Message-Id: 1493718473.f48c87b44cd3d557cedc6d75d10ba7ab98063215.mgorny@gentoo
1 commit: f48c87b44cd3d557cedc6d75d10ba7ab98063215
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 2 09:03:03 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue May 2 09:47:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48c87b4
7
8 dev-python/h5py: Clean old versions up
9
10 dev-python/h5py/Manifest | 3 -
11 dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport | 55 ------------------
12 dev-python/h5py/h5py-2.4.0.ebuild | 49 ----------------
13 dev-python/h5py/h5py-2.5.0.ebuild | 69 -----------------------
14 dev-python/h5py/h5py-2.6.0.ebuild | 64 ---------------------
15 5 files changed, 240 deletions(-)
16
17 diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
18 index 60c28c1c756..80949b0ea27 100644
19 --- a/dev-python/h5py/Manifest
20 +++ b/dev-python/h5py/Manifest
21 @@ -1,5 +1,2 @@
22 DIST h5py-2.3.1.tar.gz 1072766 SHA256 447e55d5893ca285d1185a938548a12f3f7d4af441f1a7740ac28bc3aecf85c1 SHA512 f0da1d2ac855c02fb828444d719a1b23a580adb049335f3e732ace67558a125ac8cd3b3a68ac6bf9d10aa3ab19e4672b814eb28cc8c66910750c62efb655d744 WHIRLPOOL cdd2be028d450d1566776b056550af001dd382082cce5cac9fdb8968071b9f3e9855e2c30bf12bbb800c1313343980f74c2ad3d853318585bdc6134c8af5b35c
23 -DIST h5py-2.4.0.tar.gz 172462 SHA256 faaeadf4b8ca14c054b7568842e0d12690de7d5d68af4ecce5d7b8fc104d8e60 SHA512 b341994899d27ceae81cdf920c44902e7db64cd3e613e2b4bcf19a6d0aea5f2fcc4acc946222a6e5d4b03d787b05e2dd2a2a55df99561f74d6e827a61f85b2c5 WHIRLPOOL 734e848437921f97b2169243993cd111d4f91578bce9980ec9d373113917185f47ea8b1d98732a61bbfc7c7ae8bc1481ddf53a6ee576705352b6d77e22263f27
24 -DIST h5py-2.5.0.tar.gz 684354 SHA256 9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6 SHA512 4a83f9ae1855a7fad90133b327d426201c8ccfd2e7fbe9f39b2d61a2eee2f3ebe2ea02cf80f3d4e1ad659f8e790c173df8cc99b87d0b7ce63d34aa88cfdc7939 WHIRLPOOL 7d7852d1d2481077a81dbf194e72da10d013c43ede4d2d6e319e1e2be0f70d7495b0964ea7787ddbd145ac774cdabc32c5b7e51fc7c9bfec429d673b12bcc10b
25 -DIST h5py-2.6.0.tar.gz 245539 SHA256 b2afc35430d5e4c3435c996e4f4ea2aba1ea5610e2d2f46c9cae9f785e33c435 SHA512 6f1f8bd9f56f93d950b2601f35b3ad33d648da28970874de98e5d4f4009667e2aab8774d1d570dd16169a1bedec5e58ae60fc29053292b24f9f85d86c5671ac4 WHIRLPOOL 08476fbeba889e8c100150b44c26b7c7e3ad5f6b3662efb7e777153791a0b1a176f4081f0988aacc3769753a407c9e2cf802c950c8068a9f2f4fbd4d1a89b603
26 DIST h5py-2.7.0.tar.gz 256471 SHA256 79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4 WHIRLPOOL fa38ff5d6c2a97d9eacedb0c8ccbf791ee2edb4ff652bd39a1ab102be5ec849cd45a74dd294f42fd8b2f1d943bbe1b0653afc57f6a44aed0cfc3e0b37cdc589d
27
28 diff --git a/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
29 deleted file mode 100644
30 index 06bdb83abab..00000000000
31 --- a/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
32 +++ /dev/null
33 @@ -1,55 +0,0 @@
34 -commit 364a77403199087168786234554f459e7d985063
35 -Author: Lawrence Mitchell <lawrence.mitchell@×××××××××××.uk>
36 -Date: Tue Nov 3 14:18:48 2015 +0000
37 -
38 - setup: Support building with current mpi4py version
39 -
40 - mpi4py migrated the mpi4py.mpi_c module to mpi4py.libmpi in April 2014.
41 - After the release of v1.3.1 but before v2. Sniff this in setup
42 - configure and import MPI types from the appropriate module in h5p.pyx,
43 - to allow building with MPI on and modern mpi4py versions.
44 -
45 -diff --git a/h5py/h5p.pyx b/h5py/h5p.pyx
46 -index da175dd..8a1cbb0 100644
47 ---- a/h5py/h5p.pyx
48 -+++ b/h5py/h5p.pyx
49 -@@ -25,7 +25,11 @@ from h5py import _objects
50 - from ._objects import phil, with_phil
51 -
52 - if MPI:
53 -- from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
54 -+ if MPI4PY_V2:
55 -+ from mpi4py.libmpi cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
56 -+ MPI_Comm_free, MPI_Info_free
57 -+ else:
58 -+ from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
59 - MPI_Comm_free, MPI_Info_free
60 -
61 - # Initialization
62 -diff --git a/setup_build.py b/setup_build.py
63 -index ccc0f27..e49a4e8 100644
64 ---- a/setup_build.py
65 -+++ b/setup_build.py
66 -@@ -162,14 +162,22 @@ class h5py_build_ext(build_ext):
67 - # Rewrite config.pxi file if needed
68 - if not op.isfile(config_file) or config.rebuild_required:
69 - with open(config_file, 'wb') as f:
70 -+ if config.mpi:
71 -+ import mpi4py
72 -+ from distutils.version import StrictVersion
73 -+ v2 = StrictVersion(mpi4py.__version__) > StrictVersion("1.3.1")
74 -+ else:
75 -+ v2 = False
76 - s = """\
77 - # This file is automatically generated by the h5py setup script. Don't modify.
78 -
79 - DEF MPI = %(mpi)s
80 -+DEF MPI4PY_V2 = %(mpi4py_v2)s
81 - DEF HDF5_VERSION = %(version)s
82 - DEF SWMR_MIN_HDF5_VERSION = (1,9,178)
83 - """
84 - s %= {'mpi': bool(config.mpi),
85 -+ 'mpi4py_v2': bool(v2),
86 - 'version': tuple(int(x) for x in config.hdf5_version.split('.'))}
87 - s = s.encode('utf-8')
88 - f.write(s)
89
90 diff --git a/dev-python/h5py/h5py-2.4.0.ebuild b/dev-python/h5py/h5py-2.4.0.ebuild
91 deleted file mode 100644
92 index 2839e342d80..00000000000
93 --- a/dev-python/h5py/h5py-2.4.0.ebuild
94 +++ /dev/null
95 @@ -1,49 +0,0 @@
96 -# Copyright 1999-2016 Gentoo Foundation
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=5
100 -
101 -PYTHON_COMPAT=( python{2_7,3_4} )
102 -
103 -inherit distutils-r1 flag-o-matic
104 -
105 -DESCRIPTION="Simple Python interface to HDF5 files"
106 -HOMEPAGE="http://www.h5py.org/"
107 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
108 -
109 -LICENSE="BSD"
110 -SLOT="0"
111 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
112 -IUSE="test examples mpi"
113 -
114 -RDEPEND="
115 - sci-libs/hdf5:=[mpi=,hl(+)]
116 - dev-python/numpy[${PYTHON_USEDEP}]"
117 -DEPEND="${RDEPEND}
118 - dev-python/setuptools[${PYTHON_USEDEP}]
119 - dev-python/cython[${PYTHON_USEDEP}]
120 - mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
121 -
122 -pkg_setup() {
123 - use mpi && export CC=mpicc
124 -}
125 -
126 -python_prepare_all() {
127 - append-cflags -fno-strict-aliasing
128 - distutils-r1_python_prepare_all
129 -}
130 -
131 -python_configure() {
132 - esetup.py configure $(usex mpi --mpi '')
133 -}
134 -
135 -python_test() {
136 - esetup.py test
137 -}
138 -
139 -python_install_all() {
140 - DOCS=( README.rst ANN.rst )
141 - use examples && local EXAMPLES=( examples/. )
142 -
143 - distutils-r1_python_install_all
144 -}
145
146 diff --git a/dev-python/h5py/h5py-2.5.0.ebuild b/dev-python/h5py/h5py-2.5.0.ebuild
147 deleted file mode 100644
148 index 2f014ae4f40..00000000000
149 --- a/dev-python/h5py/h5py-2.5.0.ebuild
150 +++ /dev/null
151 @@ -1,69 +0,0 @@
152 -# Copyright 1999-2016 Gentoo Foundation
153 -# Distributed under the terms of the GNU General Public License v2
154 -
155 -EAPI=5
156 -
157 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
158 -
159 -inherit distutils-r1 flag-o-matic
160 -
161 -DESCRIPTION="Simple Python interface to HDF5 files"
162 -HOMEPAGE="http://www.h5py.org/"
163 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
164 -
165 -LICENSE="BSD"
166 -SLOT="0"
167 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
168 -IUSE="doc test examples mpi"
169 -
170 -RDEPEND="
171 - sci-libs/hdf5:=[mpi=,hl(+)]
172 - dev-python/numpy[${PYTHON_USEDEP}]
173 - dev-python/six[${PYTHON_USEDEP}]"
174 -DEPEND="${RDEPEND}
175 - dev-python/cython[${PYTHON_USEDEP}]
176 - dev-python/pkgconfig[${PYTHON_USEDEP}]
177 - dev-python/setuptools[${PYTHON_USEDEP}]
178 - doc? (
179 - dev-python/alabaster[${PYTHON_USEDEP}]
180 - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
181 - )
182 - mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
183 -
184 -PATCHES=(
185 - "${FILESDIR}"/${P}-mpi4py2.backport
186 -)
187 -
188 -pkg_setup() {
189 - use mpi && export CC=mpicc
190 -}
191 -
192 -python_prepare_all() {
193 - append-cflags -fno-strict-aliasing
194 - distutils-r1_python_prepare_all
195 -}
196 -
197 -python_configure() {
198 - esetup.py configure $(usex mpi --mpi '')
199 -}
200 -
201 -python_compile_all() {
202 - if use doc; then
203 - cd "${S}"/docs || die
204 - sed '/html_theme/s:default:alabaster:g' -i conf.py || die
205 - rm -r _build || die
206 - emake html
207 - fi
208 -}
209 -
210 -python_test() {
211 - esetup.py test
212 -}
213 -
214 -python_install_all() {
215 - DOCS=( README.rst ANN.rst )
216 - use doc && HTML_DOCS=( docs/_build/html/. )
217 - use examples && local EXAMPLES=( examples/. )
218 -
219 - distutils-r1_python_install_all
220 -}
221
222 diff --git a/dev-python/h5py/h5py-2.6.0.ebuild b/dev-python/h5py/h5py-2.6.0.ebuild
223 deleted file mode 100644
224 index 5f9126c24ce..00000000000
225 --- a/dev-python/h5py/h5py-2.6.0.ebuild
226 +++ /dev/null
227 @@ -1,64 +0,0 @@
228 -# Copyright 1999-2016 Gentoo Foundation
229 -# Distributed under the terms of the GNU General Public License v2
230 -
231 -EAPI=5
232 -
233 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
234 -
235 -inherit distutils-r1 flag-o-matic
236 -
237 -DESCRIPTION="Simple Python interface to HDF5 files"
238 -HOMEPAGE="http://www.h5py.org/"
239 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
240 -
241 -LICENSE="BSD"
242 -SLOT="0"
243 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
244 -IUSE="doc test examples mpi"
245 -
246 -RDEPEND="
247 - sci-libs/hdf5:=[mpi=,hl(+)]
248 - dev-python/numpy[${PYTHON_USEDEP}]
249 - dev-python/six[${PYTHON_USEDEP}]"
250 -DEPEND="${RDEPEND}
251 - dev-python/cython[${PYTHON_USEDEP}]
252 - dev-python/pkgconfig[${PYTHON_USEDEP}]
253 - dev-python/setuptools[${PYTHON_USEDEP}]
254 - doc? (
255 - dev-python/alabaster[${PYTHON_USEDEP}]
256 - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
257 - )
258 - mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
259 -
260 -pkg_setup() {
261 - use mpi && export CC=mpicc
262 -}
263 -
264 -python_prepare_all() {
265 - append-cflags -fno-strict-aliasing
266 - distutils-r1_python_prepare_all
267 -}
268 -
269 -python_configure() {
270 - esetup.py configure $(usex mpi --mpi '')
271 -}
272 -
273 -python_compile_all() {
274 - if use doc; then
275 - cd "${S}"/docs || die
276 - sed '/html_theme/s:default:alabaster:g' -i conf.py || die
277 - emake html
278 - fi
279 -}
280 -
281 -python_test() {
282 - esetup.py test
283 -}
284 -
285 -python_install_all() {
286 - DOCS=( README.rst ANN.rst )
287 - use doc && HTML_DOCS=( docs/_build/html/. )
288 - use examples && local EXAMPLES=( examples/. )
289 -
290 - distutils-r1_python_install_all
291 -}